Merge pull request #29968 from ZTE-PaaS/zhangke-patch-014

Automatic merge from submit-queue

optimize lock of runtimeState stuct

use sync.RWMutex may be high effective for concorrent read
This commit is contained in:
Kubernetes Submit Queue 2016-08-04 20:03:47 -07:00 committed by GitHub
commit c393f11261

View File

@ -23,7 +23,7 @@ import (
)
type runtimeState struct {
sync.Mutex
sync.RWMutex
lastBaseRuntimeSync time.Time
baseRuntimeSyncThreshold time.Duration
networkError error
@ -57,8 +57,8 @@ func (s *runtimeState) setPodCIDR(cidr string) {
}
func (s *runtimeState) podCIDR() string {
s.Lock()
defer s.Unlock()
s.RLock()
defer s.RUnlock()
return s.cidr
}
@ -69,8 +69,8 @@ func (s *runtimeState) setInitError(err error) {
}
func (s *runtimeState) errors() []string {
s.Lock()
defer s.Unlock()
s.RLock()
defer s.RUnlock()
var ret []string
if s.initError != nil {
ret = append(ret, s.initError.Error())