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

[22648] Unacknowledged sample removed in KeepAll mode #5618

Merged
merged 3 commits into from
Feb 3, 2025
Merged

[22648] Unacknowledged sample removed in KeepAll mode #5618

merged 3 commits into from
Feb 3, 2025

Conversation

juanjo4936
Copy link
Contributor

@juanjo4936 juanjo4936 commented Jan 31, 2025 •
edited by EugenioCollado
Loading

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.

@juanjo4936
Refs #22648: Regression test
f06b2b7 
Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com>
@juanjo4936
Refs #22648: corrected bug
a7b9d4c 
Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com>
@juanjo4936 juanjo4936 added this to the v3.2.0 milestone Jan 31, 2025
@github-actions github-actions bot added the ci-pending PR which CI is running label Jan 31, 2025
@EugenioCollado EugenioCollado self-requested a review January 31, 2025 09:27
@EugenioCollado
Update comment
d545eaf 
Signed-off-by: EugenioCollado <121509066+EugenioCollado@users.noreply.github.com>
EugenioCollado
EugenioCollado approved these changes Jan 31, 2025
View reviewed changes
Copy link
Contributor

@EugenioCollado EugenioCollado left a comment

Choose a reason for hiding this comment

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

LGTM

@EugenioCollado EugenioCollado requested review from richiprosima and removed request for richiprosima January 31, 2025 09:31
@juanjo4936 juanjo4936 merged commit 68f97fe into master Feb 3, 2025
17 checks passed
@juanjo4936 juanjo4936 deleted the fix/reliable/unacked_sample_removed_v2 branch February 3, 2025 07:06
@juanjo4936
Copy link
Contributor Author

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

@mergify Mergify
Copy link
Contributor

mergify bot commented Feb 3, 2025 •
edited
Loading

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

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Feb 3, 2025
@juanjo4936 @mergify
[22648] Unacknowledged sample removed in KeepAll mode (#5618)
ee0d3d6 
* 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
mergify bot pushed a commit that referenced this pull request Feb 3, 2025
@juanjo4936 @mergify
[22648] Unacknowledged sample removed in KeepAll mode (#5618)
a787d3f 
* 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
This was referenced Feb 3, 2025
Merged
Open
mergify bot pushed a commit that referenced this pull request Feb 3, 2025
@juanjo4936 @mergify
[22648] Unacknowledged sample removed in KeepAll mode (#5618)
be22699 
* 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
@mergify mergify bot mentioned this pull request Feb 3, 2025
Open
12 tasks
mergify bot pushed a commit that referenced this pull request Feb 3, 2025
@juanjo4936 @mergify
[22648] Unacknowledged sample removed in KeepAll mode (#5618)
39ed442 
* 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
@mergify mergify bot mentioned this pull request Feb 3, 2025
Open
12 tasks
EugenioCollado pushed a commit that referenced this pull request Feb 4, 2025
@juanjo4936 @EugenioCollado
[22648] Unacknowledged sample removed in KeepAll mode (#5618)
7ef397c 
* 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)
MiguelCompany pushed a commit that referenced this pull request Feb 4, 2025
@juanjo4936 @EugenioCollado @MiguelCompany
[22648] Unacknowledged sample removed in KeepAll mode (#5618)
8353737 
* 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>
MiguelCompany pushed a commit that referenced this pull request Feb 5, 2025
@mergify @juanjo4936 @EugenioCollado
Unacknowledged sample removed in KeepAll mode (#5618) (#5623)
d88cc39 
* 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>
RookieCLY pushed a commit to RookieCLY/Fast-DDS that referenced this pull request Feb 6, 2025
@juanjo4936 @EugenioCollado @RookieCLY
[22648] Unacknowledged sample removed in KeepAll mode (eProsima#5618)
de8ae7a 
* 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>
RookieCLY pushed a commit to RookieCLY/Fast-DDS that referenced this pull request Feb 6, 2025
@juanjo4936 @EugenioCollado @RookieCLY
[22648] Unacknowledged sample removed in KeepAll mode (eProsima#5618)
58a354d 
* 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@EugenioCollado EugenioCollado EugenioCollado approved these changes

@richiprosima richiprosima Awaiting requested review from richiprosima

Assignees
No one assigned
Labels
ci-pending PR which CI is running
Projects
None yet
Milestone
v3.2.0
Development

Successfully merging this pull request may close these issues.
2 participants
@juanjo4936 @EugenioCollado