Skip to content

address context shutdown racy condition. (backport #3219) - #3224

Open
mergify[bot] wants to merge 1 commit into
humblefrom
mergify/bp/humble/pr-3219
Open

address context shutdown racy condition. (backport #3219)#3224
mergify[bot] wants to merge 1 commit into
humblefrom
mergify/bp/humble/pr-3219

Conversation

@mergify

@mergify mergify Bot commented Aug 12, 2026

Copy link
Copy Markdown
Contributor

Description

retarget #3217 to lyrical

Fixes # (issue)

Is this user-facing behavior change?

Did you use Generative AI?

Additional Information


This is an automatic backport of pull request #3219 done by [Mergify](https://mergify.com).

@mergify mergify Bot added the conflicts label Aug 12, 2026
@mergify

mergify Bot commented Aug 12, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of b723878 has failed:

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

You are currently cherry-picking commit b723878.
  (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:   rclcpp/src/rclcpp/signal_handler.cpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   rclcpp/src/rclcpp/context.cpp
	deleted by us:   rclcpp/test/rclcpp/test_context.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

@mergify

mergify Bot commented Aug 12, 2026

Copy link
Copy Markdown
Contributor Author

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

  • Queue this pull request

@skyegalaxy

Copy link
Copy Markdown
Member

Pulls: #3224
Gist: https://gist.githubusercontent.com/skyegalaxy/fae33de982452749c7b70ff1b2a85157/raw/1fdeb8c64154b93b474e04e6ea41ba2d09055cc0/ros2.repos
BUILD args:
TEST args:
ROS Distro: humble
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/20067

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

@fujitatomoya
fujitatomoya force-pushed the mergify/bp/humble/pr-3219 branch from 6a1a6d8 to e7fdf95 Compare August 13, 2026 07:12
Comment thread rclcpp/test/rclcpp/test_context.cpp Outdated
Signed-off-by: Tomoya Fujita <fujita.tomoya@triorb.co.jp>
(cherry picked from commit b723878)

# Conflicts:
#	rclcpp/src/rclcpp/context.cpp
#	rclcpp/test/rclcpp/test_context.cpp
@fujitatomoya
fujitatomoya force-pushed the mergify/bp/humble/pr-3219 branch from e7fdf95 to 07081f5 Compare August 13, 2026 07:15

@fujitatomoya fujitatomoya left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

the test is removed since that generates the conflicts.
i think this is still good to be backported to humble.

@fujitatomoya

Copy link
Copy Markdown
Collaborator

Pulls: #3224
Gist: https://gist.githubusercontent.com/fujitatomoya/f3bf5c0f08f9f252946d3d9db2cdf054/raw/1fdeb8c64154b93b474e04e6ea41ba2d09055cc0/ros2.repos
BUILD args: --packages-above-and-dependencies rclcpp
TEST args: --packages-above rclcpp
ROS Distro: humble
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/20071

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants