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
This commit is contained in:
Kubernetes Submit Queue 2016-09-05 23:58:27 -07:00 committed by GitHub
commit c4e2ade371

View File

@ -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...)
}