Fix lifecycle manager deadlock during shutdown (backport #5438)#5440
Merged
SteveMacenski merged 1 commit intokiltedfrom Aug 11, 2025
Merged
Fix lifecycle manager deadlock during shutdown (backport #5438)#5440SteveMacenski merged 1 commit intokiltedfrom
SteveMacenski merged 1 commit intokiltedfrom
Conversation
* Fix lifecycle manager deadlock during shutdown Add stop() method to ServiceClient that cancels internal executor operations and call it in LifecycleServiceClient destructor to prevent deadlock when CTRL+C is pressed during lifecycle node bringup. This addresses issue #5437 where spin_until_future_complete can hang indefinitely during shutdown when bringup and shutdown sequences run concurrently. Co-authored-by: Steve Macenski <SteveMacenski@users.noreply.github.com> * Update service_client.hpp Signed-off-by: Steve Macenski <stevenmacenski@gmail.com> --------- Signed-off-by: Steve Macenski <stevenmacenski@gmail.com> Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com> (cherry picked from commit f7b6654)
Contributor
Author
SteveMacenski
approved these changes
Aug 11, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR fixes the lifecycle manager deadlock issue described in #5437.
Changes
stop()method toServiceClientthat cancels internal executor operationsstop()inLifecycleServiceClientdestructor to prevent deadlockProblem Addressed
When CTRL+C is pressed during lifecycle node bringup, a race condition can cause
spin_until_future_completeto hang indefinitely as bringup and shutdown sequences run concurrently.Solution
The
stop()method cancels any running spin operations on the internal executor, allowing proper shutdown coordination.Closes #5437
Generated with Claude Code
This is an automatic backport of pull request #5438 done by Mergify.