Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[22537] Fix EDP reliability timings (backport #5540) #5557

Open
wants to merge 2 commits into
base: 2.10.x
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 9, 2025

Description

happened to find this miscalculation during ros2/rmw_fastrtps#789.
i believe that comments are the correct values, so that default Duration_t adjusted accordingly in milliseconds.

@Mergifyio backport 3.1.x 3.0.x 2.14.x 2.10.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • The code follows the style guidelines of this project.

  • N/A: Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally

  • Any new/modified methods have been properly documented using Doxygen.

  • N/A: Any new configuration API has an equivalent XML API (with the corresponding XSD extension)

  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.

  • Changes are API compatible.

  • N/A: New feature has been added to the versions.md file (if applicable).

  • N/A: New feature has been documented/Current behavior is correctly described in the documentation.

  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #5540 done by [Mergify](https://mergify.com).

* EDP default configuration should be in milliseconds, not microseconds.

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

* add the timeout for writer->wait_discovery().

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

* Refs #22537: test fix

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

---------

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
Co-authored-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit b53a389)

# Conflicts:
#	src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp
Copy link
Contributor Author

mergify bot commented Jan 9, 2025

Cherry-pick of b53a389 has failed:

On branch mergify/bp/2.10.x/pr-5540
Your branch is up to date with 'origin/2.10.x'.

You are currently cherry-picking commit b53a3899.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   test/blackbox/common/DDSBlackboxTestsStatistics.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jan 9, 2025
@mergify mergify bot mentioned this pull request Jan 9, 2025
12 tasks
@MiguelCompany MiguelCompany added this to the v2.10.7 milestone Jan 9, 2025
@fujitatomoya
Copy link
Contributor

@Mario-DL can you help me to resolve conflict here? i do not have push permission to merge branch. and #5556

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Jan 10, 2025
@MiguelCompany MiguelCompany self-requested a review January 10, 2025 06:41
@github-actions github-actions bot added the ci-pending PR which CI is running label Jan 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-pending PR which CI is running
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants