kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #55169 from sttts/sttts-cache-stop-race 

Automatic merge from submit-queue (batch tested with PRs 55169, 54990). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

apiserver: fix Cacher.Stop() race

Kubernetes-commit: 7966af637ed34b40e73b9a3c361a614e9ce3fc86
This commit is contained in:
Kubernetes Publisher 2017-11-06 08:27:36 -08:00
parent d5c7d449a9 0d9d3201c2
commit baff305a6c
2 changed files with 234 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

458
Godeps/Godeps.json generated
View File

File diff suppressed because it is too large Load Diff

8
pkg/storage/cacher.go
View File

@ -649,13 +649,15 @@ func (c *Cacher) isStopped() bool {
} }
func (c *Cacher) Stop() { func (c *Cacher) Stop() {
// TODO : Do not check for isStopped (and return) when PR // avoid stopping twice (note: cachers are shared with subresources)
// https://github.com/kubernetes/kubernetes/pull/50690
// merges as that shuts down storage properly
if c.isStopped() { if c.isStopped() {
return return
} }
c.stopLock.Lock() c.stopLock.Lock()
if c.stopped {
// avoid that it was locked meanwhile as isStopped only read-locks
return
}
c.stopped = true c.stopped = true
c.stopLock.Unlock() c.stopLock.Unlock()
close(c.stopCh) close(c.stopCh)