Fixes spin_until_future_complete inside callback (#1316)

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)
ros2 · Aug 24, 2024 · 411bede · 411bede
1 parent 53855e3
commit 411bede
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/rclpy/rclpy/__init__.py b/rclpy/rclpy/__init__.py
@@ -265,8 +265,10 @@ def spin_until_future_complete(
         if ``None`` or negative. Don't wait if 0.
     """
     executor = get_global_executor() if executor is None else executor
+    node_added = False
     try:
-        executor.add_node(node)
+        node_added = executor.add_node(node)
         executor.spin_until_future_complete(future, timeout_sec)
     finally:
-        executor.remove_node(node)
+        if node_added:
+            executor.remove_node(node)