Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 28, 2025

Description

A recent change (#1308) intended to move some future-handling logic into a lock context, but actually ended up duplicating it instead. The result is a resource leak in the Waitable's _futures list since the future is added twice but only removed once. This fixes that by removing the duplicated logic outside of the lock. It also preserves the explicit typing annotation on the future.

Is this user-facing behavior change?

No

Did you use Generative AI?

No

Additional Information


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

A recent change intended to move this logic into a lock context, but
actually ended up duplicating it instead. This fixes that by removing
the duplicated logic outside of the lock. It also preserves the explicit
typing annotation on the future.

Signed-off-by: Nathan Wiebe Neufeldt <[email protected]>
(cherry picked from commit 6e22af9)
@fujitatomoya
Copy link
Collaborator

fujitatomoya commented Oct 28, 2025

Pulls: #1534
Gist: https://gist.githubusercontent.com/fujitatomoya/232cdb1fe81f56d09a4d3c2f80b25b8b/raw/85b3d88adc582dce24b6a1d7200ad256969eecf5/ros2.repos
BUILD args: --packages-above-and-dependencies rclpy
TEST args: --packages-above rclpy
ROS Distro: kilted
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/17380

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

@ahcorde ahcorde merged commit f71d6d4 into kilted Nov 4, 2025
3 checks passed
@ahcorde ahcorde deleted the mergify/bp/kilted/pr-1532 branch November 4, 2025 16:45
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