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) #4773

Merged
merged 1 commit into from
May 14, 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 <miguelcompany@eprosima.com>

* Refs #20729. Fix issue.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20729. Update doxydoc.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

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

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 66fc7c5)
@MiguelCompany MiguelCompany added this to the v2.10.4 milestone May 13, 2024
@MiguelCompany MiguelCompany self-requested a review May 13, 2024 13:00
@github-actions github-actions bot added the ci-pending PR which CI is running label May 13, 2024
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany
Copy link
Member

@richiprosima Please test mac

1 similar comment
@MiguelCompany
Copy link
Member

@richiprosima Please test mac

@MiguelCompany MiguelCompany merged commit d24584c into 2.10.x May 14, 2024
11 of 17 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.10.x/pr-4639 branch May 14, 2024 09:55
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.

1 participant