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).

@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

@juanlofer-eprosima
Copy link
Contributor

@MiguelCompany could you please solve the conflicts here?

@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Oct 14, 2025
@MiguelCompany MiguelCompany self-requested a review October 14, 2025 09:24
@github-actions github-actions bot added the ci-pending PR which CI is running label Oct 14, 2025
@MiguelCompany
Copy link
Member

@Mergifyio rebase

Copy link
Contributor Author

mergify bot commented Oct 14, 2025

rebase

✅ Branch has been successfully rebased

@MiguelCompany MiguelCompany force-pushed the mergify/bp/3.2.x/pr-5972 branch 2 times, most recently from fdd16b7 to 66ea3d2 Compare October 14, 2025 09:32
@MiguelCompany MiguelCompany requested review from MiguelCompany and removed request for MiguelCompany October 14, 2025 09:32
Carlosespicur and others added 2 commits October 14, 2025 11:37
* Refs #23568: Set different content filter signatures for each requester

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

* Refs #23568: Add test

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

---------

Signed-off-by: Carlosespicur <[email protected]>
(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
Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany MiguelCompany force-pushed the mergify/bp/3.2.x/pr-5972 branch from 66ea3d2 to 9b7dffa Compare October 14, 2025 09:37
@MiguelCompany MiguelCompany requested review from MiguelCompany and removed request for MiguelCompany October 14, 2025 09:37
Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany MiguelCompany requested review from MiguelCompany and removed request for MiguelCompany October 14, 2025 12:04
Copy link
Contributor Author

mergify bot commented Oct 14, 2025

🧪 CI Insights

Here's what we observed from your CI run for 319f1ce.

❌ Job Failures

Pipeline Job Health on 3.2.x Retries 🔍 CI Insights 📄 Logs
Fast DDS MacOS CI mac-ci / fastdds_test () Unknown 0 View View

@MiguelCompany MiguelCompany merged commit 2c782f3 into 3.2.x Oct 15, 2025
27 of 28 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/3.2.x/pr-5972 branch October 15, 2025 05:54
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.

3 participants