Fix race condition on shutdown in try_discover_source()#143
Merged
MichaelOrlov merged 2 commits intoros-tooling:rollingfrom Apr 21, 2026
Merged
Fix race condition on shutdown in try_discover_source()#143MichaelOrlov merged 2 commits intoros-tooling:rollingfrom
MichaelOrlov merged 2 commits intoros-tooling:rollingfrom
Conversation
Signed-off-by: MarqRazz <marq.razz@gmail.com>
Contributor
|
@MichaelOrlov Is this ready to be merged? Thank you! |
Member
|
@christophfroehlich Thank you for pinging me here. I overlooked when CI finished and forgot to merge this PR. |
Contributor
|
Thanks for merging. Can I ask you for a release of the package? It'll hopefully fix some of our flaky tests ;) |
Member
|
Contributor
|
thank you! |
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
3 participants
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.
In ros2_control we have been having issues with topic_tools/relay not playing nice with SIGINT and failing tests. RelayNode creates a
discovery_timer_that fires every 100ms and calls make_subscribe_unsubscribe_decisions() → try_discover_source() → get_publishers_info_by_topic(). When SIGINT is received,rclcpp::shutdown()invalidates the context, but the timer can still fire and callget_publishers_info_by_topicon the now-invalid context, throwing an uncaught exception.This PR adds a guard to check for the node shutting down and returns early so the exception is not thrown.