Skip to content

fix(supervisor): stop selecting closed shutdown channel #1760

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
theolujay wants to merge 2 commits into
base: master
Choose a base branch
from
+4 −1
Open

fix(supervisor): stop selecting closed shutdown channel #1760

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0daf3be
fix(supervisor): stop shutdown busy loop
theolujay Oct 8, 2026
833b2fe
Merge branch 'master' of https://github.com/cloudflare/cloudflared
theolujay Oct 8, 2026
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
5 changes: 4 additions & 1 deletion supervisor/supervisor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ func (s *Supervisor) Run(
var backoffTimer <-chan time.Time

shuttingDown := false
gracefulShutdownC := s.gracefulShutdownC
for {
select {
// Context cancelled
Expand Down Expand Up @@ -175,8 +176,10 @@ func (s *Supervisor) Run(
// No more tunnels outstanding, clear backoff timer
backoff.SetGracePeriod()
}
case <-s.gracefulShutdownC:
case <-gracefulShutdownC:
shuttingDown = true
// Avoid making the loop spin while the tunnels drain.
gracefulShutdownC = nil
}
}
}
Expand Down