upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-06-11 09:53:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

mark QuotaMonitor as not running and invalidate monitors list

Browse source 
to prevent close of closed channel panic
This commit is contained in:
Filip Křepinský 2025-12-05 15:50:32 +01:00
parent 4e94e70dca
commit feffdbbcf2
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkg/controller/garbagecollector/graph_builder.go
View file

@ -94,8 +94,9 @@ type GraphBuilder struct {
// This channel is also protected by monitorLock.
stopCh <-chan struct{}
// running tracks whether Run() has been called.
// it is protected by monitorLock.
// running is set to true when the Run() function has been called.
// It will revert to false when the Run() function receives a cancellation.
// It is protected by monitorLock.
running bool
eventRecorder record.EventRecorder

10
pkg/controller/resourcequota/resource_quota_monitor.go
View file

@ -79,8 +79,9 @@ type QuotaMonitor struct {
// This channel is also protected by monitorLock.
stopCh <-chan struct{}
// running tracks whether Run() has been called.
// it is protected by monitorLock.
// running is set to true when the Run() function has been called.
// It will revert to false when the Run() function receives a cancellation.
// It is protected by monitorLock.
running bool
// monitors are the producer of the resourceChanges queue
@ -333,6 +334,10 @@ func (qm *QuotaMonitor) Run(ctx context.Context) {
// Stop any running monitors.
qm.monitorLock.Lock()
defer qm.monitorLock.Unlock()
// Mark as not running so that no new monitors can be started.
// Not doing this here could cause goroutine leaks and deadlocks since it would make it possible for startMonitors
// to proceed and start new monitors after stopMonitors has been called.
qm.running = false
monitors := qm.monitors
stopped := 0
for _, monitor := range monitors {
@ -341,6 +346,7 @@ func (qm *QuotaMonitor) Run(ctx context.Context) {
close(monitor.stopCh)
}
}
qm.monitors = nil
qm.monitorWG.Wait()
logger.Info("QuotaMonitor stopped monitors", "stopped", stopped, "total", len(monitors))
}