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

[22710] Filter interested readers on PDP writer (backport #5604) (backport #5672) #5709

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

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 17, 2025

Description

Manual backport ABI compatible from: #5604

This fixes a high CPU and network usage situation with PDP simple discovery when a new participant is created in a network where there is a high number of existing participants.

@Mergifyio backport 2.10x

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.

  • NA 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.

  • NA New feature has been added to the versions.md file (if applicable).

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

Copy link
Contributor Author

mergify bot commented Mar 17, 2025

Cherry-pick of b56b56a has failed:

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

You are currently cherry-picking commit b56b56ae.
  (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:   include/fastdds/rtps/writer/StatelessWriter.h
	modified:   src/cpp/CMakeLists.txt
	modified:   src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
	new file:   src/cpp/rtps/builtin/discovery/participant/simple/PDPStatelessWriter.cpp
	new file:   src/cpp/rtps/builtin/discovery/participant/simple/PDPStatelessWriter.hpp
	modified:   src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpoints.hpp
	modified:   src/cpp/rtps/writer/StatelessWriter.cpp
	modified:   test/blackbox/api/dds-pim/PubSubParticipant.hpp
	modified:   test/blackbox/common/BlackboxTestsDiscovery.cpp
	modified:   test/blackbox/common/DDSBlackboxTestsListeners.cpp
	modified:   test/unittest/dds/publisher/CMakeLists.txt

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   src/cpp/rtps/participant/RTPSParticipantImpl.cpp
	both modified:   test/blackbox/api/fastrtps_deprecated/PubSubParticipant.hpp
	deleted by us:   test/blackbox/common/DDSBlackboxTestsMonitorService.cpp
	both modified:   test/unittest/statistics/dds/CMakeLists.txt

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 added the conflicts Backport PR wich git cherry pick failed label Mar 17, 2025
@MiguelCompany MiguelCompany added this to the v2.10.7 milestone Mar 17, 2025
* Refs #22506. Regression test.

Signed-off-by: Eugenio Collado <[email protected]>

* Refs #22506. Filter interested readers on PDP writer

Signed-off-by: Eugenio Collado <[email protected]>

* Fix IncompatibleQosGetters

Signed-off-by: Eugenio Collado <[email protected]>

* Fix PubSubParticipant rtps deprecated

Signed-off-by: Eugenio Collado <[email protected]>

---------

Manual conflicts resolution from  commit b56b56a

Signed-off-by: Eugenio Collado <[email protected]>
@EugenioCollado EugenioCollado force-pushed the mergify/bp/2.10.x/pr-5672 branch from b1407e9 to 99b8eb0 Compare March 17, 2025 15:01
@EugenioCollado EugenioCollado added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Mar 17, 2025
@MiguelCompany MiguelCompany requested review from richiprosima and removed request for richiprosima April 2, 2025 07:17
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