Skip to content

K
k3s
Unverified Commit 7966af63 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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
parents 48827891 a30c0f47
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
staging/src/k8s.io/apiserver/pkg/storage/cacher.go
View file @ 7966af63
...@@ -649,13 +649,15 @@ func (c *Cacher) isStopped() bool { ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment