Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Mar 18, 2025

Description

This PR ensures that OpenOutputChannel is called in the transports for every locator that might be used by any reader or writer.

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

@Mergifyio backport 2.6.x

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.

  • 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 #5704 done by [Mergify](https://mergify.com).
This is an automatic backport of pull request #5711 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Mar 18, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Mar 18, 2025

Cherry-pick of 2c7e56f has failed:

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

You are currently cherry-picking commit 2c7e56f4.
  (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/participant/RTPSParticipantImpl.cpp
	modified:   src/cpp/rtps/reader/StatelessReader.cpp
	modified:   src/cpp/rtps/writer/StatefulWriter.cpp
	modified:   src/cpp/rtps/writer/StatelessWriter.cpp
	modified:   test/blackbox/common/BlackboxTestsTransportTCP.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/participant/RTPSParticipantImpl.h
	both modified:   src/cpp/statistics/rtps/messages/OutputTrafficManager.hpp

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

@MiguelCompany MiguelCompany added this to the v2.14.5 milestone Mar 19, 2025
@EugenioCollado EugenioCollado force-pushed the mergify/bp/2.14.x/pr-5711 branch from 59147e5 to a4afa7f Compare June 30, 2025 09:21
@EugenioCollado EugenioCollado self-requested a review June 30, 2025 09:21
@EugenioCollado EugenioCollado added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Jun 30, 2025
@EugenioCollado EugenioCollado requested review from EugenioCollado and removed request for EugenioCollado June 30, 2025 09:22
@EugenioCollado EugenioCollado added ci-pending PR which CI is running and removed ci-pending PR which CI is running labels Jun 30, 2025
* Fix assertion on `OutputTrafficManager` (#5704)

* Refs #22930. Add entry when missing on `set_statistics_message_data`.

Signed-off-by: Miguel Company <[email protected]>

* Refs #22930. Create sender resources on stateless readers.

Signed-off-by: Miguel Company <[email protected]>

* Refs #22930. Similar changes on writers.

Signed-off-by: Miguel Company <[email protected]>

* Refs #22930: Test TCP with best effort reader

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

* Refs #22930: Uncrustify

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

Uncrustify

Signed-off-by: Eugenio Collado <[email protected]>
@EugenioCollado EugenioCollado force-pushed the mergify/bp/2.14.x/pr-5711 branch from 03a2b66 to f907146 Compare June 30, 2025 09:42
@EugenioCollado EugenioCollado requested review from EugenioCollado and removed request for EugenioCollado and richiprosima June 30, 2025 09:47
Copy link
Contributor

@EugenioCollado EugenioCollado left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@EugenioCollado EugenioCollado merged commit 61d01e0 into 2.14.x Jul 1, 2025
19 checks passed
@EugenioCollado EugenioCollado deleted the mergify/bp/2.14.x/pr-5711 branch July 1, 2025 05:30
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