fix: serialize TaskController lifecycle ops to prevent orphaned election tasks#146
Merged
Keshoid merged 3 commits intoMay 18, 2026
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR serializes TaskController lifecycle operations to prevent concurrent restarts from interleaving and orphaning spawned service tasks.
Changes:
- Added an async
lifecyclemutex to serializeenable,disable, andrestart. - Split lifecycle operations into public locked methods and private locked helpers.
- Added a concurrent restart regression smoke test.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
… in concurrent_restarts test
Lapo4kaKek
approved these changes
May 17, 2026
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
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.
Problem
config elections enable/include/excludeHTTP handlers firetokio::spawn(restart())without serialization.TaskController::restart()isdisable().await; enable().awaitwith the innerstd::sync::Mutex<State>released between phases (and dropped acrosshandle.await). Two concurrent restarts can interleave such that a task is spawned by caller B, then itscancel/handleare overwritten by caller A's resumedenable()— orphaning B's task until process shutdown.Fix
Add a
tokio::sync::Mutex<()>(lifecycle) toTaskController. Publicenable/disable/restarteach acquire it first, then delegate to private_lockedhelpers (original bodies unchanged).restart()now holds the lock across the full disable→enable sequence, so concurrent callers queue instead of racing.The existing
std::sync::Mutex<State>is kept for short critical sections sostatus()stays non-blocking and isn't held back by long-running lifecycle work.Scope (deliberately minimal)
tokio::spawn(restart())— now safe because restarts queue onlifecycle. Switching them toawaitwould block the HTTP response on restart duration, which is a separate UX decision.Closes SMA-89