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

* 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: Miguel Company <[email protected]>
Signed-off-by: cferreiragonz <[email protected]>
Co-authored-by: cferreiragonz <[email protected]>
(cherry picked from commit 777a71b)

# Conflicts:
#	src/cpp/rtps/reader/StatelessReader.cpp
#	src/cpp/rtps/writer/StatelessWriter.cpp
@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 777a71b has failed:

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

You are currently cherry-picking commit 777a71b4.
  (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/participant/RTPSParticipantImpl.hpp
	modified:   src/cpp/rtps/writer/StatefulWriter.cpp
	modified:   src/cpp/statistics/rtps/messages/OutputTrafficManager.hpp
	modified:   test/blackbox/common/BlackboxTestsTransportTCP.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/reader/StatelessReader.cpp
	both modified:   src/cpp/rtps/writer/StatelessWriter.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

@MiguelCompany MiguelCompany added this to the v3.1.3 milestone Mar 18, 2025
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Mar 18, 2025
@MiguelCompany MiguelCompany self-requested a review March 18, 2025 14:03
@github-actions github-actions bot added the ci-pending PR which CI is running label Mar 18, 2025
@MiguelCompany
Copy link
Member

@Mergifyio backport 2.14.x 2.10.x

@mergify
Copy link
Contributor Author

mergify bot commented Mar 18, 2025

backport 2.14.x 2.10.x

✅ Backports have been created

Details

@MiguelCompany MiguelCompany merged commit 2c7e56f into 3.1.x Mar 18, 2025
15 of 17 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/3.1.x/pr-5704 branch March 18, 2025 21:17
mergify bot added a commit that referenced this pull request Mar 18, 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: Miguel Company <[email protected]>
Signed-off-by: cferreiragonz <[email protected]>
Co-authored-by: cferreiragonz <[email protected]>
(cherry picked from commit 777a71b)

# Conflicts:
#	src/cpp/rtps/reader/StatelessReader.cpp
#	src/cpp/rtps/writer/StatelessWriter.cpp

* Fix conflicts

---------

Co-authored-by: Miguel Company <[email protected]>
(cherry picked from commit 2c7e56f)

# Conflicts:
#	src/cpp/rtps/participant/RTPSParticipantImpl.h
#	src/cpp/statistics/rtps/messages/OutputTrafficManager.hpp
mergify bot added a commit that referenced this pull request Mar 18, 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: Miguel Company <[email protected]>
Signed-off-by: cferreiragonz <[email protected]>
Co-authored-by: cferreiragonz <[email protected]>
(cherry picked from commit 777a71b)

# Conflicts:
#	src/cpp/rtps/reader/StatelessReader.cpp
#	src/cpp/rtps/writer/StatelessWriter.cpp

* Fix conflicts

---------

Co-authored-by: Miguel Company <[email protected]>
(cherry picked from commit 2c7e56f)

# Conflicts:
#	src/cpp/rtps/participant/RTPSParticipantImpl.cpp
#	src/cpp/rtps/participant/RTPSParticipantImpl.h
#	src/cpp/rtps/writer/StatelessWriter.cpp
#	src/cpp/statistics/rtps/messages/OutputTrafficManager.hpp
MiguelCompany added a commit that referenced this pull request May 29, 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: Miguel Company <[email protected]>
Signed-off-by: cferreiragonz <[email protected]>
Co-authored-by: cferreiragonz <[email protected]>
(cherry picked from commit 777a71b)

* Fix conflicts

---------

Co-authored-by: Miguel Company <[email protected]>
MiguelCompany added a commit that referenced this pull request May 29, 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: Miguel Company <[email protected]>
Signed-off-by: cferreiragonz <[email protected]>
Co-authored-by: cferreiragonz <[email protected]>
(cherry picked from commit 777a71b)

* Fix conflicts

---------

Co-authored-by: Miguel Company <[email protected]>
MiguelCompany added a commit that referenced this pull request May 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: Miguel Company <[email protected]>
Signed-off-by: cferreiragonz <[email protected]>
Co-authored-by: cferreiragonz <[email protected]>
(cherry picked from commit 777a71b)

* Fix conflicts

---------

Co-authored-by: Miguel Company <[email protected]>
MiguelCompany added a commit that referenced this pull request May 30, 2025
* Fix assertion on `OutputTrafficManager` (#5704)

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



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



* Refs #22930. Similar changes on writers.



* Refs #22930: Test TCP with best effort reader



* Refs #22930: Uncrustify



---------




(cherry picked from commit 777a71b)

* Fix conflicts

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Miguel Company <[email protected]>
EugenioCollado pushed a commit that referenced this pull request 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]>
EugenioCollado pushed a commit that referenced this pull request 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 pushed a commit that referenced this pull request Jul 1, 2025
* Fix assertion on `OutputTrafficManager` (#5704)

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



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



* Refs #22930. Similar changes on writers.



* Refs #22930: Test TCP with best effort reader



* Refs #22930: Uncrustify




Uncrustify

Signed-off-by: Eugenio Collado <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
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