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

[20729] Allow processing of AckNack submessages with count == 0 (backport #4639) #4774

Merged
merged 2 commits into from
May 16, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 13, 2024

Description

As spotted by omg-dds/dds-rtps#35, Fast DDS ignores AckNack messages where the count field is 0.

This PR adds a unit test for ReaderProxy::check_and_set_acknack_count, and fixes the issue by changing the check on acknack_count from last received to next expected.

@Mergifyio backport 2.13.x 2.10.x 2.6.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • The code follows the style guidelines of this project.

  • 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.

  • Changes are ABI compatible.

  • 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.
  • 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 #4639 done by [Mergify](https://mergify.com).

* Refs #20729. Regression test.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20729. Fix issue.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20729. Update doxydoc.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20729. Dont create timers if participant is nullptr.

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 66fc7c5)

# Conflicts:
#	test/unittest/rtps/writer/ReaderProxyTests.cpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label May 13, 2024
Copy link
Contributor Author

mergify bot commented May 13, 2024

Cherry-pick of 66fc7c5 has failed:

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

You are currently cherry-picking commit 66fc7c533.
  (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:   include/fastdds/rtps/writer/ReaderProxy.h
	modified:   src/cpp/rtps/writer/ReaderProxy.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/unittest/rtps/writer/ReaderProxyTests.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

Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label May 13, 2024
@Mario-DL
Copy link
Member

@richiprosima please test this

@Mario-DL Mario-DL self-requested a review May 14, 2024 14:13
@github-actions github-actions bot added the ci-pending PR which CI is running label May 14, 2024
Copy link
Member

@Mario-DL Mario-DL left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Failed tests unrelated to this PR.

@Mario-DL Mario-DL added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels May 16, 2024
@EduPonz EduPonz merged commit f8d09ba into 2.6.x May 16, 2024
12 of 17 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-4639 branch May 16, 2024 06:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants