Skip to content

K
k3s
Commit c393f112 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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
parents 353df208 e9b0454a
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
pkg/kubelet/runtime.go
View file @ c393f112
...@@ -23,7 +23,7 @@ import ( ...@@ -23,7 +23,7 @@ import (
) )
type runtimeState struct { type runtimeState struct {
sync.Mutex sync.RWMutex
lastBaseRuntimeSync time.Time lastBaseRuntimeSync time.Time
baseRuntimeSyncThreshold time.Duration baseRuntimeSyncThreshold time.Duration
networkError error networkError error
...@@ -57,8 +57,8 @@ func (s *runtimeState) setPodCIDR(cidr string) { ...@@ -57,8 +57,8 @@ func (s *runtimeState) setPodCIDR(cidr string) {
} }
func (s *runtimeState) podCIDR() string { func (s *runtimeState) podCIDR() string {
s.Lock() s.RLock()
defer s.Unlock() defer s.RUnlock()
return s.cidr return s.cidr
} }
...@@ -69,8 +69,8 @@ func (s *runtimeState) setInitError(err error) { ...@@ -69,8 +69,8 @@ func (s *runtimeState) setInitError(err error) {
} }
func (s *runtimeState) errors() []string { func (s *runtimeState) errors() []string {
s.Lock() s.RLock()
defer s.Unlock() defer s.RUnlock()
var ret []string var ret []string
if s.initError != nil { if s.initError != nil {
ret = append(ret, s.initError.Error()) ret = append(ret, s.initError.Error())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment