main_phase_timer should be stopped along with SD #740
Conversation
This file contains 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
If not stopped, it might prevent routingmanagerd from quitting gracefully. Thread will be blocked on join().
lutzbichler
approved these changes
Aug 6, 2024
| @@ -3235,6 +3236,13 @@ service_discovery_impl::start_main_phase_timer() { | |||
| this, std::placeholders::_1)); | |||
| } | |||
|
|
|||
| void | |||
| service_discovery_impl::stop_main_phase_timer() { | |||
| std::lock_guard<std::mutex> its_lock(main_phase_timer_mutex_); | |||
There was a problem hiding this comment.
As suggested by sonarcube
Suggested change
| std::lock_guard<std::mutex> its_lock(main_phase_timer_mutex_); | |
| std::scoped_lock<std::mutex> its_lock(main_phase_timer_mutex_); |
There was a problem hiding this comment.
@kheaactua what do you think of this change?
There was a problem hiding this comment.
I don't think it adds anything.... Reading up on this, when dealing with a single mutex lock_guard seems equivalent. There are arguments on SO where some people try to claim lock_guard is deprecated, but I see no evidence of that in the standard.
I suppose I don't have strong feelings either way. :)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
If
main_phase_timerisn't stopped, it might preventroutingmanagerdfrom quitting gracefully. Thread will be blocked onjoin().This is a followup on #559. The issue is a sporative (through rare)
SIGTERMon exit fromroutingmanagerd.The key signature of the crash appears to be:
That PR inverted the ownership structure in SD (better explained by @vvcarvalho here.) This change however calls a stop on
main_phase_timerduring shutdown.