Merge pull request kubernetes#76795 from tedyu/cacher-read

k8s-ci-robot · web-flow · commit 24c964d5c164 · 2019-04-26T05:48:29.000-07:00
Use read lock in ready#check
diff --git a/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher.go b/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher.go
@@ -1245,7 +1245,7 @@ type ready struct {
 }
 
 func newReady() *ready {
-	return &ready{c: sync.NewCond(&sync.Mutex{})}
+	return &ready{c: sync.NewCond(&sync.RWMutex{})}
 }
 
 func (r *ready) wait() {
@@ -1259,8 +1259,9 @@ func (r *ready) wait() {
 // TODO: Make check() function more sophisticated, in particular
 // allow it to behave as "waitWithTimeout".
 func (r *ready) check() bool {
-	r.c.L.Lock()
-	defer r.c.L.Unlock()
+	rwMutex := r.c.L.(*sync.RWMutex)
+	rwMutex.RLock()
+	defer rwMutex.RUnlock()
 	return r.ok
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1245,7 +1245,7 @@ type ready struct {`
`1245`	`1245`	`}`
`1246`	`1246`
`1247`	`1247`	`func newReady() *ready {`
`1248`		`- return &ready{c: sync.NewCond(&sync.Mutex{})}`
	`1248`	`+ return &ready{c: sync.NewCond(&sync.RWMutex{})}`
`1249`	`1249`	`}`
`1250`	`1250`
`1251`	`1251`	`func (r *ready) wait() {`
`@@ -1259,8 +1259,9 @@ func (r *ready) wait() {`
`1259`	`1259`	`// TODO: Make check() function more sophisticated, in particular`
`1260`	`1260`	`// allow it to behave as "waitWithTimeout".`
`1261`	`1261`	`func (r *ready) check() bool {`
`1262`		`- r.c.L.Lock()`
`1263`		`- defer r.c.L.Unlock()`
	`1262`	`+ rwMutex := r.c.L.(*sync.RWMutex)`
	`1263`	`+ rwMutex.RLock()`
	`1264`	`+ defer rwMutex.RUnlock()`
`1264`	`1265`	`return r.ok`
`1265`	`1266`	`}`
`1266`	`1267`