Merge pull request #26767 from ZTE-PaaS/249043822-patch-2

Automatic merge from submit-queue Update reason_cache.go, Get method operate lru cache not threadsafe The reason_cache wrapped lru cache , lru cache modies linked list even for a get, should use WLock for both read and write

Merge pull request #26767 from ZTE-PaaS/249043822-patch-2
da6d348b · k8s-merge-robot · GitHub · 5d6397e9 · f76510d9 · da6d348b
Commit da6d348b authored Jun 12, 2016 by k8s-merge-robot Committed by GitHub Jun 12, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

reason_cache.go pkg/kubelet/reason_cache.go +3 -3

No files found.
--- a/pkg/kubelet/reason_cache.go
+++ b/pkg/kubelet/reason_cache.go
@@ -36,7 +36,7 @@ import (
 // TODO(random-liu): Use more reliable cache which could collect garbage of failed pod.
 // TODO(random-liu): Move reason cache to somewhere better.
 type ReasonCache struct {
-	lock  sync.RWMutex
+	lock  sync.Mutex
 	cache *lru.Cache
 }
@@ -93,8 +93,8 @@ func (c *ReasonCache) Remove(uid types.UID, name string) {
 // whether an error reason is found in the cache. If no error reason is found, empty string will
 // be returned for error reason and error message.
 func (c *ReasonCache) Get(uid types.UID, name string) (error, string, bool) {
-	c.lock.RLock()
+	c.lock.Lock()
-	defer c.lock.RUnlock()
+	defer c.lock.Unlock()
 	value, ok := c.cache.Get(c.composeKey(uid, name))
 	if !ok {
 		return nil, "", ok