[22648] Unacknowledged sample removed in KeepAll mode #5618

juanjo4936 · 2025-01-31T08:33:26Z

on_unacknowledged_sample_removed callback is called when writer with keep all history is used, when the history was full but before max_blocking_time a sample was acknowledged, as is_acked was checked before the waiting time, and is not re-checked. This should not happen, as keep all should never drop an unacknowledged sample.

@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.
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
N/A 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.

Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com>

test/blackbox/common/DDSBlackboxTestsListeners.cpp

Signed-off-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com>

EugenioCollado

LGTM

juanjo4936 · 2025-02-03T07:06:15Z

https://github.com/Mergifyio backport 3.1.x 3.0.x 2.14.x 2.10.x

mergify · 2025-02-03T07:06:38Z

backport 3.1.x 3.0.x 2.14.x 2.10.x

✅ Backports have been created

#5623 [22648] Unacknowledged sample removed in KeepAll mode (backport #5618) has been created for branch 3.1.x but encountered conflicts
#5624 [22648] Unacknowledged sample removed in KeepAll mode (backport #5618) has been created for branch 3.0.x but encountered conflicts
#5625 [22648] Unacknowledged sample removed in KeepAll mode (backport #5618) has been created for branch 2.14.x but encountered conflicts
#5626 [22648] Unacknowledged sample removed in KeepAll mode (backport #5618) has been created for branch 2.10.x but encountered conflicts

* Refs #22648: Regression test Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com> * Refs #22648: corrected bug Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com> * Update comment Signed-off-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com> --------- Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com> Signed-off-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com> Co-authored-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com> (cherry picked from commit 68f97fe) # Conflicts: # test/blackbox/common/DDSBlackboxTestsListeners.cpp

* Refs #22648: Regression test Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com> * Refs #22648: corrected bug Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com> * Update comment Signed-off-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com> --------- Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com> Signed-off-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com> Co-authored-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com> (cherry picked from commit 68f97fe)

* Refs #22648: Regression test Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com> * Refs #22648: corrected bug Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com> * Update comment Signed-off-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com> --------- Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com> Signed-off-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com> Co-authored-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com>

* Refs #22648: Regression test * Refs #22648: corrected bug * Update comment --------- Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com> Signed-off-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com> Co-authored-by: juanjo4936 <69901369+juanjo4936@users.noreply.github.com> Co-authored-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com>

* Refs #22648: Regression test Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com> * Refs #22648: corrected bug Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com> * Update comment Signed-off-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com> --------- Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com> Signed-off-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com> Co-authored-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com> Signed-off-by: RookieCLY <2238379153@qq.com>

* [22648] Unacknowledged sample removed in KeepAll mode (#5618) * Refs #22648: Regression test Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com> * Refs #22648: corrected bug Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com> * Update comment Signed-off-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com> --------- Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com> Signed-off-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com> Co-authored-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com> (cherry picked from commit 68f97fe) * Colcon fix Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com> --------- Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com> Co-authored-by: juanjo4936 <69901369+juanjo4936@users.noreply.github.com> Co-authored-by: Eugenio Collado <eugeniocollado@eprosima.com>

* Refs #22648: Regression test Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com> * Refs #22648: corrected bug Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com> * Update comment Signed-off-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com> --------- Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com> Signed-off-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com> Co-authored-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com> (cherry picked from commit 68f97fe)

* Refs #22648: Regression test Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com> * Refs #22648: corrected bug Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com> * Update comment Signed-off-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com> --------- Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com> Signed-off-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com> Co-authored-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com> (cherry picked from commit 68f97fe) Co-authored-by: juanjo4936 <69901369+juanjo4936@users.noreply.github.com>

* Refs #22648: Regression test Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com> * Refs #22648: corrected bug Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com> * Update comment Signed-off-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com> --------- Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com> Signed-off-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com> Co-authored-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com>

* Refs #22648: Regression test * Refs #22648: corrected bug * Update comment --------- Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com> Signed-off-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com> Co-authored-by: juanjo4936 <69901369+juanjo4936@users.noreply.github.com> Co-authored-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com>

Juanjo Garcia added 2 commits January 31, 2025 09:31

Refs #22648: Regression test

f06b2b7

Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com>

Refs #22648: corrected bug

a7b9d4c

Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com>

juanjo4936 added this to the v3.2.0 milestone Jan 31, 2025

juanjo4936 requested a review from richiprosima January 31, 2025 08:33

github-actions bot added the ci-pending PR which CI is running label Jan 31, 2025

EugenioCollado self-requested a review January 31, 2025 09:27

EugenioCollado requested changes Jan 31, 2025

View reviewed changes

test/blackbox/common/DDSBlackboxTestsListeners.cpp Outdated Show resolved Hide resolved

Update comment

d545eaf

Signed-off-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com>

EugenioCollado approved these changes Jan 31, 2025

View reviewed changes

EugenioCollado requested review from richiprosima and removed request for richiprosima January 31, 2025 09:31

juanjo4936 merged commit 68f97fe into master Feb 3, 2025
17 checks passed

juanjo4936 deleted the fix/reliable/unacked_sample_removed_v2 branch February 3, 2025 07:06

This was referenced Feb 3, 2025

[22648] Unacknowledged sample removed in KeepAll mode (backport #5618) #5623

Merged

[22648] Unacknowledged sample removed in KeepAll mode (backport #5618) #5624

Merged

mergify bot mentioned this pull request Feb 3, 2025

[22648] Unacknowledged sample removed in KeepAll mode (backport #5618) #5625

Merged

12 tasks

mergify bot mentioned this pull request Feb 3, 2025

[22648] Unacknowledged sample removed in KeepAll mode (backport #5618) #5626

Merged

12 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[22648] Unacknowledged sample removed in KeepAll mode #5618

[22648] Unacknowledged sample removed in KeepAll mode #5618

Uh oh!

juanjo4936 commented Jan 31, 2025 •

edited by EugenioCollado

Loading

Uh oh!

Uh oh!

EugenioCollado left a comment

Uh oh!

Uh oh!

juanjo4936 commented Feb 3, 2025

Uh oh!

mergify bot commented Feb 3, 2025 •

edited

Loading

Uh oh!

Uh oh!

[22648] Unacknowledged sample removed in KeepAll mode #5618

[22648] Unacknowledged sample removed in KeepAll mode #5618

Uh oh!

Conversation

juanjo4936 commented Jan 31, 2025 • edited by EugenioCollado Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Contributor Checklist

Reviewer Checklist

Uh oh!

Uh oh!

EugenioCollado left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

juanjo4936 commented Feb 3, 2025

Uh oh!

mergify bot commented Feb 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Backports have been created

Uh oh!

Uh oh!

juanjo4936 commented Jan 31, 2025 •

edited by EugenioCollado

Loading

mergify bot commented Feb 3, 2025 •

edited

Loading