Skip to content

[22814] Improve DS routines (backport #5764) #5784

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

Open
wants to merge 1 commit into
base: 2.14.x
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 25, 2025

Description

This PR aims to improve efficiency of DS routines by reducing the number of messages sent (Data(p), Data(r) and Data(w)). It does so by:

  • Avoiding re-sending the server's Data(p) to relevant participants every time its own Data(p) is added to the pdp_queue (when a new client is discovered). Now a direct message to the new discovered client is sent instead of adding the server's Data(p) to the queue, which led to multiple sends to all direct clients.
  • Sending just one Data(p) and Data(r/w) to direct clients by considering a three-state value (unmatched, sent & matched) for DiscoveryParticipantsAckStatus instead of just a boolean. In this way the Discovery DB avoids re-sending repeated data when processing topics.

Related PR:

@Mergifyio backport 3.1.x 2.14.x 2.10.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • The code follows the style guidelines of this project.

  • N/A 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 #5764 done by [Mergify](https://mergify.com).

* Refs #22814: Data(p) test

Signed-off-by: cferreiragonz <[email protected]>

* Refs #22814: Data(r/w) test

Signed-off-by: cferreiragonz <[email protected]>

* Refs #22814: Tristate for ParticipantsAckStatus

Signed-off-by: cferreiragonz <[email protected]>

* Refs #22814: Send direct messages to new clients

Signed-off-by: cferreiragonz <[email protected]>

* Refs #22814: Review - Changes

Signed-off-by: cferreiragonz <[email protected]>

* Refs #22814: Uncrustify

Signed-off-by: cferreiragonz <[email protected]>

---------

Signed-off-by: cferreiragonz <[email protected]>
(cherry picked from commit 0fa7b1e)

# Conflicts:
#	src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.cpp
#	src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.hpp
#	src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantsAckStatus.cpp
#	src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantsAckStatus.hpp
#	src/cpp/rtps/builtin/discovery/database/DiscoverySharedInfo.hpp
#	src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Apr 25, 2025
Copy link
Contributor Author

mergify bot commented Apr 25, 2025

Cherry-pick of 0fa7b1e has failed:

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

You are currently cherry-picking commit 0fa7b1eb.
  (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/rtps/builtin/discovery/database/DiscoverySharedInfo.cpp
	modified:   src/cpp/rtps/builtin/discovery/participant/PDPServer.hpp
	modified:   test/blackbox/api/dds-pim/PubSubParticipant.hpp
	modified:   test/blackbox/common/BlackboxTestsDiscovery.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.cpp
	both modified:   src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.hpp
	both modified:   src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantsAckStatus.cpp
	both modified:   src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantsAckStatus.hpp
	both modified:   src/cpp/rtps/builtin/discovery/database/DiscoverySharedInfo.hpp
	both modified:   src/cpp/rtps/builtin/discovery/participant/PDPServer.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

@mergify mergify bot mentioned this pull request Apr 25, 2025
11 tasks
@Mario-DL Mario-DL added this to the v2.14.5 milestone Apr 29, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts Backport PR wich git cherry pick failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants