Skip to content

add spinning state for the Executor classes. (backport #1510)#1576

Merged
ahcorde merged 2 commits intojazzyfrom
mergify/bp/jazzy/pr-1510
Jan 15, 2026
Merged

add spinning state for the Executor classes. (backport #1510)#1576
ahcorde merged 2 commits intojazzyfrom
mergify/bp/jazzy/pr-1510

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jan 9, 2026

Description

Follow up of #1477 (review)

Is this user-facing behavior change?

Possibly yes, it explicitly throws the exception on the 2nd spin call if the executor is already spinning.

Did you use Generative AI?

No

Additional Information

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

@fujitatomoya @mergify
add spinning state for the Executor classes. (#1510)
a26537b 
Signed-off-by: Tomoya.Fujita <tomoya.fujita825@gmail.com>
(cherry picked from commit cf9240a)

# Conflicts:
#	rclpy/rclpy/executors.py
@mergify mergify bot added the conflicts label Jan 9, 2026
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Jan 9, 2026

Cherry-pick of cf9240a has failed:

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

You are currently cherry-picking commit cf9240a.
  (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

@mergify mergify bot mentioned this pull request Jan 9, 2026
Merged
@fujitatomoya
resolve conflicts.
2d025e7 
Signed-off-by: Tomoya.Fujita <Tomoya.Fujita@sony.com>
fujitatomoya
fujitatomoya approved these changes Jan 13, 2026
View reviewed changes
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.

lgtm with green CI.

@fujitatomoya
Copy link
Copy Markdown
Collaborator

fujitatomoya commented Jan 13, 2026 •
edited by ahcorde
Loading

Pulls: #1576
Gist: https://gist.githubusercontent.com/fujitatomoya/c60a66d0f3936a53f6d7897b0462b6af/raw/2fe4334a811e756f7cdf61c5f3659a0ea7cc4a76/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/17921

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

@ahcorde ahcorde merged commit 92db4c8 into jazzy Jan 15, 2026
2 of 3 checks passed
@ahcorde ahcorde deleted the mergify/bp/jazzy/pr-1510 branch January 15, 2026 21:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ahcorde ahcorde ahcorde approved these changes

@fujitatomoya fujitatomoya fujitatomoya approved these changes

Assignees

No one assigned

Labels

conflicts

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@fujitatomoya @ahcorde