-
Notifications
You must be signed in to change notification settings - Fork 775
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
[20815] Only apply content filter to ALIVE changes (backport #4876) #4904
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Cherry-pick of 9a64956 has failed:
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 |
12 tasks
6 tasks
EduPonz
force-pushed
the
mergify/bp/2.6.x/pr-4876
branch
from
June 8, 2024 07:48
bc0e236
to
10108e8
Compare
EduPonz
added
temporarily-blocked
PR must be merged after another one
and removed
conflicts
Backport PR wich git cherry pick failed
labels
Jun 8, 2024
EduPonz
force-pushed
the
mergify/bp/2.6.x/pr-4876
branch
from
June 8, 2024 08:11
10108e8
to
68c1d2b
Compare
EduPonz
force-pushed
the
mergify/bp/2.6.x/pr-4876
branch
from
June 8, 2024 13:07
68c1d2b
to
f7da609
Compare
@richiprosima please test discovery-server |
* Refs #20815: Add regression test Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20815: Only apply filter to ALIVE changes Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20815: Rename change_is_relevant_for_filter argument Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20815: Refactor test Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20815: Cast loop index to uint16_t for assigning it to the key field Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20815: Refactor test so PubSubWriter can be used directly Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20815: Fix memory leak Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20815: Apply Mario's suggestions Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20815: Add type traits to PubSubWriterReader and PubSubParticipant Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20815: Default move ctor and assignment in DynamicLoanableSequence Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20815: Add doxygen in DynamicLoanableSequence Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20815: Delete copy semantic from DynamicLoanableSequence Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20815: Use alias for TypeTraits::DataListType in PubSub* classes Signed-off-by: eduponz <eduardoponz@eprosima.com> --------- Signed-off-by: eduponz <eduardoponz@eprosima.com> (cherry picked from commit 9a64956) Signed-off-by: eduponz <eduardoponz@eprosima.com>
…d functions Signed-off-by: eduponz <eduardoponz@eprosima.com>
Signed-off-by: eduponz <eduardoponz@eprosima.com>
EduPonz
force-pushed
the
mergify/bp/2.6.x/pr-4876
branch
from
June 25, 2024 07:33
f7da609
to
f788aa0
Compare
EduPonz
approved these changes
Jun 25, 2024
@richiprosima please test discovery-server |
Mario-DL
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
Jun 26, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Backport of #4835 to 2.x
This PR fixes a bug that caused the content filter to also be applied to
unregister
anddisposed
samples. Since in those messages the only fields populated (if any) are the ones annotated with@key
, theunregister
anddispose
samples did not pass the filter (in general) and thus were being discarded. This caused several issues:unregister
ordispose
followed by awrite
were triggeringsample_lost
events, as the received sequence numbers were not consecutive (because of the filtering out of theunregister
/dispose
).This PR fixes these issues by only querying for sample relevance when the
CacheChange
kind isALIVE
.@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.
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
This is an automatic backport of pull request #4876 done by [Mergify](https://mergify.com).