Skip to content

fix(daemon): wrap bgWG.Wait() with 5s timeout in doStop() (PILOT-318) #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
matthew-pilot wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −1
Open

fix(daemon): wrap bgWG.Wait() with 5s timeout in doStop() (PILOT-318) #212

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion pkg/daemon/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1325,7 +1325,19 @@ func (d *Daemon) Stop() error {
func (d *Daemon) doStop() {
// Wait for all daemon-scoped background goroutines to notice
// stopCh and exit before tearing down shared infrastructure.
d.bgWG.Wait()
// Use a 5-second timeout to prevent a hung goroutine (e.g.
// blocked on registry I/O during an outage) from blocking
// shutdown forever. Leaked goroutines are the lesser evil.
done := make(chan struct{})
go func() {
d.bgWG.Wait()
close(done)
}()
select {
case <-done:
case <-time.After(5 * time.Second):
slog.Warn("timed out waiting for background goroutines to exit", "leaked", true)
}

// v1.9.1: emit a shutdown signal BEFORE any teardown so operators
// can distinguish planned drain from crash. Auto-scalers and
Expand Down
Loading