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

Fixes spin_until_future_complete removing node it didn't add (backport #1316) #1342

Merged
merged 1 commit into from
Sep 6, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 24, 2024

Closes #1313
Current if spin_unitl_future_complete is called inside a nodes callback it removes the node from the executor
This results in any subsiquent waitables to never be checked by the node since the node is no longer in the executor
This aims to fix that by only removing the node from the executor if it wasn't already present


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

Closes rclpy:#1313
Current if spin_unitl_future_complete is called inside a nodes callback it removes the node from the executor
This results in any subsiquent waitables to never be checked by the node since the node is no longer in the executor
This aims to fix that by only removing the node from the executor if it wasn't already present

Signed-off-by: Jonathan Blixt <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 47346ef)
@fujitatomoya
Copy link
Collaborator

Pulls: #1342
Gist: https://gist.githubusercontent.com/fujitatomoya/6e1b7b073ae6f84c90ef05e26e980331/raw/705ad21a864c84ba8acd059e819896b4e4977049/ros2.repos
BUILD args: --packages-above-and-dependencies rclpy
TEST args: --packages-above rclpy
ROS Distro: iron
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/14485

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

@sloretz
Copy link
Contributor

sloretz commented Sep 6, 2024

Pulls: #1342
Gist: https://gist.githubusercontent.com/sloretz/c4576362e9ae8268e577051567afbb00/raw/705ad21a864c84ba8acd059e819896b4e4977049/ros2.repos
BUILD args: --packages-up-to rclpy
TEST args: --packages-select rclpy
ROS Distro: iron
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/14525

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

@ahcorde
Copy link
Contributor

ahcorde commented Sep 6, 2024

Linux-rhel warnings are unrelated.

@ahcorde ahcorde merged commit 10a6c9e into iron Sep 6, 2024
3 checks passed
@ahcorde ahcorde deleted the mergify/bp/iron/pr-1316 branch September 6, 2024 09:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants