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

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

Merged
merged 2 commits into from
Feb 10, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 3, 2025

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.

This is an automatic backport of pull request #5618 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Feb 3, 2025
Copy link
Contributor Author

mergify bot commented Feb 3, 2025

Cherry-pick of 68f97fe has failed:

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

You are currently cherry-picking commit 68f97fe2.
  (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:   src/cpp/fastdds/publisher/DataWriterHistory.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/blackbox/common/DDSBlackboxTestsListeners.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

@juanjo4936 juanjo4936 added this to the v2.14.5 milestone Feb 3, 2025
* 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)
@EugenioCollado EugenioCollado force-pushed the mergify/bp/2.14.x/pr-5618 branch from be22699 to 7ef397c Compare February 4, 2025 15:30
@EugenioCollado EugenioCollado self-requested a review February 4, 2025 15:30
@EugenioCollado EugenioCollado added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Feb 4, 2025
Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
@EugenioCollado EugenioCollado requested review from EugenioCollado and removed request for richiprosima and EugenioCollado February 5, 2025 07:17
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 merged commit 9adca59 into 2.14.x Feb 10, 2025
18 checks passed
@EugenioCollado EugenioCollado deleted the mergify/bp/2.14.x/pr-5618 branch February 10, 2025 06:36
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.

2 participants