-
Notifications
You must be signed in to change notification settings - Fork 783
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[21245] Fix topic interference on liveliness_changed
status (backport #4988) (backport #5032)
#5046
base: 2.6.x
Are you sure you want to change the base?
Conversation
Cherry-pick of 4a6b934 has failed:
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 |
82a119c
to
aa25589
Compare
* 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) * 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)
aa25589
to
5b1f365
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@MiguelCompany you may want to give it a quick look |
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.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
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).