Skip to content

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

Merged
sloretz merged 1 commit intojazzyfrom
mergify/bp/jazzy/pr-1316
Sep 6, 2024
Merged

Fixes spin_until_future_complete removing node it didn't add (backport #1316)#1341
sloretz merged 1 commit intojazzyfrom
mergify/bp/jazzy/pr-1316

Conversation

@mergify
Copy link
Copy Markdown
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 <jmblixt3@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 47346ef)
@jmblixt3
Copy link
Copy Markdown
Contributor

Why is the DCO check failing here?

@christophebedard
Copy link
Copy Markdown
Member

christophebedard commented Aug 24, 2024

See https://github.com/ros2/rclpy/pull/1341/checks?check_run_id=29191298421

Commit sha: 411bede, Author: Jonathan, Committer: Mergify; Expected "Jonathan jmblixt3@gmail.com", but got "Jonathan Blixt jmblixt3@gmail.com".

In my experience, this is caused by a mismatch between the sign-off name and the GitHub profile name. Sometimes when merging a commit, GitHub sets the commit author name to the GitHub profile name.

The DCO check can be overridden by maintainers, though.

@fujitatomoya
Copy link
Copy Markdown
Collaborator

Pulls: #1341
Gist: https://gist.githubusercontent.com/fujitatomoya/7a7eb87220c859db26fad7ecf2d3fc22/raw/3bdb52f1647864c45acd8887dca55b6c9013dce4/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/14484

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

@sloretz sloretz merged commit 26a7251 into jazzy Sep 6, 2024
@sloretz sloretz deleted the mergify/bp/jazzy/pr-1316 branch September 6, 2024 00:35
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