Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 26, 2025

Description

This PR fixes an error detected when on a RPC scenario with two clients using a single server with thread pool, in which one the clients does not receive the replies sent by the server. As each requester uses a filter with the same signature (i:e: same expression and parameters), replies sent to the client 2 (the one that does not receive the replies) are discarded at the Requester's reader size, because the evaluation for client 1 was false. The problem is resolved by setting different filter signatures for each requester.

@Mergifyio backport 3.3.x 3.2.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 #5972 done by [Mergify](https://mergify.com).

* Refs #23568: Set different content filter signatures for each requester

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Refs #23568: Add test

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

---------

Signed-off-by: Carlosespicur <carlosespicur@proton.me>
(cherry picked from commit 5e01f49)

# Conflicts:
#	src/cpp/fastdds/rpc/RequesterImpl.cpp
#	test/blackbox/api/dds-pim/ReqRepHelloWorldReplier.cpp
#	test/blackbox/api/dds-pim/ReqRepHelloWorldReplier.hpp
#	test/blackbox/api/dds-pim/ReqRepHelloWorldRequester.cpp
#	test/blackbox/api/dds-pim/ReqRepHelloWorldRequester.hpp
#	test/blackbox/common/DDSBlackboxTestsRPC.cpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Aug 26, 2025
Copy link
Contributor Author

mergify bot commented Aug 26, 2025

Cherry-pick of 5e01f49 has failed:

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

You are currently cherry-picking commit 5e01f498.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/fastdds/rpc/RequesterImpl.cpp
	both modified:   test/blackbox/api/dds-pim/ReqRepHelloWorldReplier.cpp
	both modified:   test/blackbox/api/dds-pim/ReqRepHelloWorldReplier.hpp
	both modified:   test/blackbox/api/dds-pim/ReqRepHelloWorldRequester.cpp
	both modified:   test/blackbox/api/dds-pim/ReqRepHelloWorldRequester.hpp
	both modified:   test/blackbox/common/DDSBlackboxTestsRPC.cpp

no changes added to commit (use "git add" and/or "git commit -a")

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

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