[21245] Fix topic interference on liveliness_changed status (backport #4988) (backport #5032)
#5044
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
* Fix topic interference on `liveliness_changed` status (#4988) * Refs #21189. Basic infrastructure for ROS2 blackbox tests. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21189. Added callback for liveliness_changed event. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21189. Added ROS2 regression test. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21189. Added blackbox regression test. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21189. Fix StatefulReader. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21189. Fix StatelessReader. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21189. Uncrustify and doxygen. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21245. Change liveliness announcement periods. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21245. Create ROS 2 builtin endpoints. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21245. Fix type and QoS on ros_discovery_info. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21245. Avoid collision with true ROS 2 topics. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21245. Uncrustify. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21245. Fix warnings on MacOS. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21245. Fix tsan reported deadlock. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21189. Fix long-standing deadlock in WLP. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21189. Fix build after rebase. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 9243ead) # Conflicts: # src/cpp/rtps/reader/StatefulReader.cpp # src/cpp/rtps/reader/StatelessReader.cpp # test/blackbox/common/BlackboxTestsLivelinessQos.cpp * Fix conflicts Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Fix build after backport. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 4a6b934)
12 tasks
JesusPoderoso
approved these changes
Jul 9, 2024
|
Mac CI issue is unrelated to the PR |
JesusPoderoso
added
ready-to-merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
PR #4822 (and its backports) introduced a regression that was not detected until we requested ROS 2 rolling to use branch 2.14.x here
This PR:
@Mergifyio backport 2.14.x 2.13.x 2.10.x 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.mdfile (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
This is an automatic backport of pull request #4988 done by [Mergify](https://mergify.com).
This is an automatic backport of pull request #5032 done by [Mergify](https://mergify.com).