github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Bugfix: fix channel leak when stop error

Browse Source
This commit is contained in:
caiweidong 2019-04-26 13:09:20 +08:00
parent e6188f8c29
commit a01f0b4e5e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/util/pluginwatcher/plugin_watcher.go
View File

@ -161,14 +161,17 @@ func (w *Watcher) Stop() error {
close(w.stopCh) close(w.stopCh)
c := make(chan struct{}) c := make(chan struct{})
var once sync.Once
closeFunc := func() { close(c) }
go func() { go func() {
defer close(c) defer once.Do(closeFunc)
w.wg.Wait() w.wg.Wait()
}() }()
select { select {
case <-c: case <-c:
case <-time.After(11 * time.Second): case <-time.After(11 * time.Second):
once.Do(closeFunc)
return fmt.Errorf("timeout on stopping watcher") return fmt.Errorf("timeout on stopping watcher")
} }