Merge pull request #31761 from ZTE-PaaS/zhangke-patch-032

Automatic merge from submit-queue change sourcesSeenLock to sync.RWMutex seenSources can be accessed concurrently

Merge pull request #31761 from ZTE-PaaS/zhangke-patch-032
c4e2ade3 · Kubernetes Submit Queue · GitHub · 5e22e51f · 29edf627 · c4e2ade3
Commit c4e2ade3 authored Sep 05, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 05, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

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

No files found.
--- a/pkg/kubelet/config/config.go
+++ b/pkg/kubelet/config/config.go
@@ -125,7 +125,7 @@ type podStorage struct {
 	updates    chan<- kubetypes.PodUpdate

 	// contains the set of all sources that have sent at least one SET
-	sourcesSeenLock sync.Mutex
+	sourcesSeenLock sync.RWMutex
 	sourcesSeen     sets.String

 	// the EventRecorder to use
@@ -314,8 +314,8 @@ func (s *podStorage) markSourceSet(source string) {
 }

 func (s *podStorage) seenSources(sources ...string) bool {
-	s.sourcesSeenLock.Lock()
-	defer s.sourcesSeenLock.Unlock()
+	s.sourcesSeenLock.RLock()
+	defer s.sourcesSeenLock.RUnlock()
 	return s.sourcesSeen.HasAll(sources...)
 }