-
Notifications
You must be signed in to change notification settings - Fork 791
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
[20239] Make DataWriters always send the key hash on keyed topics #4238
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
Checked that the |
Before asking for the CI here, we should wait for #4261 to be merged |
EduPonz
suggested changes
Jan 24, 2024
Mario-DL
force-pushed
the
hotfix/20239
branch
4 times, most recently
from
January 25, 2024 06:52
cd87725
to
aa1a576
Compare
@Mergifyio backport 2.12.x 2.11.x 2.10.x 2.6.x |
✅ Backports have been created
|
@Mergifyio rebase master |
❌ Base branch update has failedGit reported the following error:
|
EduPonz
approved these changes
Jan 27, 2024
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com>
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com>
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com>
… not null instancehandle should be expected Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com>
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com>
@richiprosima please test this |
MiguelCompany
changed the title
[20239] Make DataWriters always send the serialized key on keyed topics
[20239] Make DataWriters always send the key hash on keyed topics
Jan 30, 2024
mergify bot
pushed a commit
that referenced
this pull request
Feb 2, 2024
* Refs #20239: Add regression test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Fix Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Change some assert logic in DDSStatus tests since now, a not null instancehandle should be expected Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Apply rev suggestions Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> (cherry picked from commit 4d8c489)
mergify bot
pushed a commit
that referenced
this pull request
Feb 2, 2024
* Refs #20239: Add regression test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Fix Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Change some assert logic in DDSStatus tests since now, a not null instancehandle should be expected Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Apply rev suggestions Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> (cherry picked from commit 4d8c489)
mergify bot
pushed a commit
that referenced
this pull request
Feb 2, 2024
* Refs #20239: Add regression test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Fix Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Change some assert logic in DDSStatus tests since now, a not null instancehandle should be expected Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Apply rev suggestions Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> (cherry picked from commit 4d8c489)
This was referenced Feb 2, 2024
mergify bot
pushed a commit
that referenced
this pull request
Feb 2, 2024
* Refs #20239: Add regression test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Fix Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Change some assert logic in DDSStatus tests since now, a not null instancehandle should be expected Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Apply rev suggestions Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> (cherry picked from commit 4d8c489) # Conflicts: # test/blackbox/common/DDSBlackboxTestsListeners.cpp
1 task
MiguelCompany
pushed a commit
that referenced
this pull request
Feb 14, 2024
* Refs #20239: Add regression test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Fix Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Change some assert logic in DDSStatus tests since now, a not null instancehandle should be expected Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Apply rev suggestions Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> (cherry picked from commit 4d8c489)
MiguelCompany
pushed a commit
that referenced
this pull request
Feb 14, 2024
) * Refs #20239: Add regression test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Fix Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Change some assert logic in DDSStatus tests since now, a not null instancehandle should be expected Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Apply rev suggestions Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> (cherry picked from commit 4d8c489) Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com>
EduPonz
pushed a commit
that referenced
this pull request
Mar 4, 2024
* Refs #20239: Add regression test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Fix Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Change some assert logic in DDSStatus tests since now, a not null instancehandle should be expected Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Apply rev suggestions Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> (cherry picked from commit 4d8c489) # Conflicts: # test/blackbox/common/DDSBlackboxTestsListeners.cpp
MiguelCompany
pushed a commit
that referenced
this pull request
Mar 6, 2024
* Refs #20239: Add regression test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Fix Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Change some assert logic in DDSStatus tests since now, a not null instancehandle should be expected Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Apply rev suggestions Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> (cherry picked from commit 4d8c489)
EduPonz
pushed a commit
that referenced
this pull request
Mar 6, 2024
) * Make DataWriters always send the key hash on keyed topics (#4238) * Refs #20239: Add regression test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Fix Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Change some assert logic in DDSStatus tests since now, a not null instancehandle should be expected Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Apply rev suggestions Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> (cherry picked from commit 4d8c489) # Conflicts: # test/blackbox/common/DDSBlackboxTestsListeners.cpp * Refs #20239: Fix conflicts Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> --------- Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com> Co-authored-by: JesusPoderoso <jesuspoderoso@eprosima.com>
MiguelCompany
pushed a commit
that referenced
this pull request
Mar 8, 2024
) * Refs #20239: Add regression test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Fix Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Change some assert logic in DDSStatus tests since now, a not null instancehandle should be expected Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Apply rev suggestions Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> (cherry picked from commit 4d8c489) Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com>
elianalf
pushed a commit
that referenced
this pull request
Mar 12, 2024
* Refs #20239: Add regression test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Fix Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Change some assert logic in DDSStatus tests since now, a not null instancehandle should be expected Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Apply rev suggestions Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> (cherry picked from commit 4d8c489)
EduPonz
pushed a commit
that referenced
this pull request
Mar 12, 2024
) * Refs #20239: Add regression test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Fix Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Change some assert logic in DDSStatus tests since now, a not null instancehandle should be expected Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Apply rev suggestions Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> (cherry picked from commit 4d8c489) Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com>
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
This PR corrects the behavior of the DataWriters on keyed topics. Currently, if the DataReader does not
expect_inline_qos
, then the DataWriter is not sending the key despite of publishing on a keyed topic.This PR makes the DataWriter always send the key regardless of the configuration of the reader if the topic is keyed.
Note: the builtin endpoints are retrieving the key in their listeners. In fact, its the first thing they do (
computeKey()
). It is true that they are the filling theinstancehandle
from thePID_ENDPOINT_GUID
instead of thePID_KEY_HASH
which could be arguable if we are strict, but in essence, both carry the same information, the completeguid
of the entity@Mergifyio backport 2.12.x 2.11.x 2.10.x 2.6.x
Contributor Checklist
versions.md
file (if applicable).Reviewer Checklist