Skip to content

shutdown ThreadPoolExecutor in MultiThreadedExecutor. (backport #1309)#1670

Open
mergify[bot] wants to merge 2 commits into
jazzyfrom
mergify/bp/jazzy/pr-1309
Open

shutdown ThreadPoolExecutor in MultiThreadedExecutor. (backport #1309)#1670
mergify[bot] wants to merge 2 commits into
jazzyfrom
mergify/bp/jazzy/pr-1309

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented May 19, 2026

Fixes: #893


This is an automatic backport of pull request #1309 done by Mergify.

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
Co-authored-by: Alex Thiel <apocthiel@gmail.com>
(cherry picked from commit ee79763)

# Conflicts:
#	rclpy/rclpy/executors.py
@mergify mergify Bot added the conflicts label May 19, 2026
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented May 19, 2026

Cherry-pick of ee79763 has failed:

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

You are currently cherry-picking commit ee79763.
  (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:   rclpy/test/test_executor.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rclpy/rclpy/executors.py

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

Signed-off-by: Tomoya.Fujita <tomoya.fujita825@gmail.com>
Copy link
Copy Markdown
Collaborator

@fujitatomoya fujitatomoya left a comment

Choose a reason for hiding this comment

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

@christophebedard @ahcorde can you approve? i just fixed the conflicts, so i cannot approve my fix.

@ahcorde
Copy link
Copy Markdown
Contributor

ahcorde commented May 25, 2026

Pulls: #1670
Gist: https://gist.githubusercontent.com/ahcorde/7d1a77e6931b23784f0179ba83da65dd/raw/f28081e735c7074abd1a8cc7ac902007e26a4971/ros2.repos
BUILD args: --packages-above-and-dependencies rclpy
TEST args: --packages-above rclpy
ROS Distro: jazzy
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/19358

  • 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