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.

Sign up for GitHub

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

Jump to bottom

[20729] Allow processing of AckNack submessages with count == 0 #4639

Merged
merged 4 commits into from
Apr 4, 2024
Merged

[20729] Allow processing of AckNack submessages with count == 0 #4639

merged 4 commits into from
Apr 4, 2024

Conversation

MiguelCompany
Copy link
Member

@MiguelCompany MiguelCompany commented Apr 2, 2024 •
edited by EduPonz
Loading

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.

@MiguelCompany
Refs #20729. Regression test.
5b792c2 
Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany
Refs #20729. Fix issue.
530e8da 
Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany MiguelCompany added this to the v2.14.1 milestone Apr 2, 2024
@MiguelCompany MiguelCompany mentioned this pull request Apr 2, 2024
Closed
@EduPonz EduPonz self-requested a review April 3, 2024 06:39
@EduPonz
Copy link

EduPonz commented Apr 3, 2024

@richiprosima please test this

@github-actions github-actions bot added ci-pending PR which CI is running labels Apr 3, 2024
EduPonz
EduPonz approved these changes Apr 3, 2024
View reviewed changes
Copy link

@EduPonz EduPonz left a comment

Choose a reason for hiding this comment

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

LGTM with green CI

@EduPonz EduPonz requested review from EduPonz and removed request for EduPonz April 3, 2024 13:02
@EduPonz
Copy link

EduPonz commented Apr 3, 2024

@richiprosima please test this

@EduPonz EduPonz 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 Apr 4, 2024
@EduPonz EduPonz merged commit 66fc7c5 into master Apr 4, 2024
14 of 16 checks passed
@EduPonz EduPonz deleted the bugfix/20729 branch April 4, 2024 10:42
@MiguelCompany
Copy link
Member Author

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

@mergify Mergify
Copy link
Contributor

mergify bot commented May 13, 2024 •
edited
Loading

backport 2.13.x 2.10.x 2.6.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request May 13, 2024
@MiguelCompany @mergify
Allow processing of AckNack submessages with count == 0 (#4639)
f3a538c 
* 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)
mergify bot pushed a commit that referenced this pull request May 13, 2024
@MiguelCompany @mergify
Allow processing of AckNack submessages with count == 0 (#4639)
7b8a76e 
* 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)
@mergify mergify bot mentioned this pull request May 13, 2024
Merged
12 tasks
mergify bot pushed a commit that referenced this pull request May 13, 2024
@MiguelCompany @mergify
Allow processing of AckNack submessages with count == 0 (#4639)
30bf3ec 
* 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
This was referenced May 13, 2024
Merged
Merged
MiguelCompany added a commit that referenced this pull request May 14, 2024
@mergify @MiguelCompany
Allow processing of AckNack submessages with count == 0 (#4639) (#4773)
d24584c 
* 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)

Co-authored-by: Miguel Company <[email protected]>
EduPonz pushed a commit that referenced this pull request May 16, 2024
@mergify @MiguelCompany
Allow processing of AckNack submessages with count == 0 (#4639) (#4774)
f8d09ba 
* Allow processing of AckNack submessages with count == 0 (#4639)

* 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

* Fix conflicts

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

---------

Signed-off-by: Miguel Company <[email protected]>
Co-authored-by: Miguel Company <[email protected]>
EduPonz pushed a commit that referenced this pull request May 16, 2024
@mergify @MiguelCompany
Allow processing of AckNack submessages with count == 0 (#4639) (#4772)
ca40f53 
* 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)

Co-authored-by: Miguel Company <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@EduPonz EduPonz EduPonz approved these changes

Assignees
No one assigned
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Milestone
v2.14.1
Development

Successfully merging this pull request may close these issues.
2 participants
@MiguelCompany @EduPonz