upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-05-28 04:04:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

controller/volume/ephemeral: Improve goroutine mgmt

Browse source 
Make sure all threads are terminated when Run returns.
This commit is contained in:
Ondra Kupka 2025-10-28 20:02:16 +01:00
parent 12205df76d
commit 27774052ab
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkg/controller/volume/ephemeral/controller.go
View file

@ -19,6 +19,7 @@ package ephemeral
import (
"context"
"fmt"
"sync"
"time"
"k8s.io/klog/v2"
@ -168,19 +169,26 @@ func (ec *ephemeralController) onPVCDelete(obj interface{}) {
func (ec *ephemeralController) Run(ctx context.Context, workers int) {
defer runtime.HandleCrash()
defer ec.queue.ShutDown()
logger := klog.FromContext(ctx)
logger.Info("Starting ephemeral volume controller")
defer logger.Info("Shutting down ephemeral volume controller")
var wg sync.WaitGroup
defer func() {
logger.Info("Shutting down ephemeral volume controller")
ec.queue.ShutDown()
wg.Wait()
}()
if !cache.WaitForNamedCacheSyncWithContext(ctx, ec.podSynced, ec.pvcsSynced) {
return
}
for i := 0; i < workers; i++ {
go wait.UntilWithContext(ctx, ec.runWorker, time.Second)
wg.Go(func() {
wait.UntilWithContext(ctx, ec.runWorker, time.Second)
})
}
<-ctx.Done()
}