Skip to content
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

[humble] Fix for rosbag2_transport::Recorder failures due to the unhandled exceptions (backport #1382) #1403

Merged
merged 2 commits into from
Jun 18, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 17, 2023

This is an automatic backport of pull request #1382 done by Mergify.
Cherry-pick of bb8d2a5 has failed:

On branch mergify/bp/humble/pr-1382
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit bb8d2a5.
  (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:   rosbag2_transport/src/rosbag2_transport/recorder.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/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…eptions (#1382)

* Fix for rosbag2_transport::Recorder failures due to unhandled exceptions

Signed-off-by: Michael Orlov <michael.orlov@apex.ai>

* Revert "Fix for rosbag2_transport::Recorder failures due to unhandled exceptions"

This reverts commit 767d440.

Signed-off-by: Michael Orlov <michael.orlov@apex.ai>

* Handle exceptions in event publisher and discovery threads

- Exceptions potentially may come from the underlying node operations
when we are invalidating context via rclcpp::shutdown(). We need to have
possibility to correct finish recording in this case.

Signed-off-by: Michael Orlov <michael.orlov@apex.ai>

---------

Signed-off-by: Michael Orlov <michael.orlov@apex.ai>
(cherry picked from commit bb8d2a5)

# Conflicts:
#	rosbag2_transport/src/rosbag2_transport/recorder.cpp
@mergify mergify bot requested a review from a team as a code owner June 17, 2023 01:41
@mergify mergify bot requested review from MichaelOrlov and jhdcs and removed request for a team June 17, 2023 01:41
@mergify mergify bot added the conflicts label Jun 17, 2023
@MichaelOrlov MichaelOrlov changed the title Fix for rosbag2_transport::Recorder failures due to the unhandled exceptions (backport #1382) [humble] Fix for rosbag2_transport::Recorder failures due to the unhandled exceptions (backport #1382) Jun 17, 2023
@MichaelOrlov MichaelOrlov marked this pull request as draft June 17, 2023 01:42
Signed-off-by: Michael Orlov <michael.orlov@apex.ai>
@MichaelOrlov MichaelOrlov marked this pull request as ready for review June 18, 2023 08:58
@MichaelOrlov MichaelOrlov added humble Humble Hawksbill and removed conflicts labels Jun 18, 2023
@MichaelOrlov
Copy link
Contributor

Pulls: #1403
Gist: https://gist.githubusercontent.com/MichaelOrlov/4e9eee347d98ee7b6c2e7be51e701367/raw/03f1acfeac81dd6645eb93510e32db33ff9154f6/ros2.repos
BUILD args: --packages-above-and-dependencies rosbag2_transport ros2bag
TEST args: --packages-above rosbag2_transport ros2bag
ROS Distro: humble
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/12262

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status

@MichaelOrlov
Copy link
Contributor

MichaelOrlov commented Jun 18, 2023

New warnings on CI are unrelated to the changes in this PR and refer to the ros2/rclcpp/rclcpp/test/rclcpp/executors/test_executors.cpp:697 and
ros2/rclcpp/rclcpp/test/rclcpp/executors/test_executors.cpp:676

�[01m�[K/home/jenkins-agent/workspace/ci_linux/ws/install/gtest_vendor/src/gtest_vendor/include/gtest/gtest.h:1554:23:�[m�[K   required from ‘�[01m�[Kstatic testing::AssertionResult testing::internal::EqHelper::Compare(const char*, const char*, const T1&, const T2&) [with T1 = unsigned int; T2 = int; typename std::enable_if<((! std::is_integral<_Tp>::value) || (! std::is_pointer<_Dp>::value))>::type* <anonymous> = 0]�[m�[K’
�[01m�[K/home/jenkins-agent/workspace/ci_linux/ws/src/ros2/rclcpp/rclcpp/test/rclcpp/executors/test_executors.cpp:676:3:�[m�[K   required from ‘�[01m�[Kvoid TestIntraprocessExecutors_testIntraprocessRetrigger_Test<gtest_TypeParam_>::TestBody() [with gtest_TypeParam_ = rclcpp::executors::MultiThreadedExecutor]�[m�[K’
�[01m�[K/home/jenkins-agent/workspace/ci_linux/ws/src/ros2/rclcpp/rclcpp/test/rclcpp/executors/test_executors.cpp:654:1:�[m�[K   required from here
�[01m�[K/home/jenkins-agent/workspace/ci_linux/ws/install/gtest_vendor/src/gtest_vendor/include/gtest/gtest.h:1527:11:�[m�[K �[01;35m�[Kwarning: �[m�[Kcomparison of integer expressions of different signedness: ‘�[01m�[Kconst unsigned int�[m�[K’ and ‘�[01m�[Kconst int�[m�[K’ [�[01;35m�[K-Wsign-compare�[m�[K]
 1527 |   if (�[01;35m�[Klhs == rhs�[m�[K) {
      |       �[01;35m�[K~~~~^~~~~~�[m�[K

@MichaelOrlov MichaelOrlov merged commit 07fd903 into humble Jun 18, 2023
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/humble/pr-1382 branch June 18, 2023 17:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
humble Humble Hawksbill
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant