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

Merge pull request #55169 from sttts/sttts-cache-stop-race
7966af63 · Kubernetes Submit Queue · GitHub · 48827891 · a30c0f47 · 7966af63
Unverified Commit 7966af63 authored Nov 06, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 06, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

cacher.go staging/src/k8s.io/apiserver/pkg/storage/cacher.go +5 -3

No files found.
--- a/staging/src/k8s.io/apiserver/pkg/storage/cacher.go
+++ b/staging/src/k8s.io/apiserver/pkg/storage/cacher.go
@@ -649,13 +649,15 @@ func (c *Cacher) isStopped() bool {
 }

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