github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #77304 from cwdsuzhou/fix_leak_when_stop_error

Browse Source 
Bugfix: fix chan leak when stop error
This commit is contained in:
Kubernetes Prow Robot 2019-05-14 18:24:55 -07:00 committed by GitHub
commit 032b4d39c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -155,14 +155,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")
} }