Merge pull request #77157 from tedyu/kubelet-node-addr-read

Utilize read lock for getLastObservedNodeAddresses
This commit is contained in:
Kubernetes Prow Robot 2019-05-01 14:32:42 -07:00 committed by GitHub
commit d457a5d214
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -901,7 +901,7 @@ type Kubelet struct {
iptClient utilipt.Interface
rootDirectory string
lastObservedNodeAddressesMux sync.Mutex
lastObservedNodeAddressesMux sync.RWMutex
lastObservedNodeAddresses []v1.NodeAddress
// onRepeatedHeartbeatFailure is called when a heartbeat operation fails more than once. optional.

View File

@ -510,8 +510,8 @@ func (kl *Kubelet) setLastObservedNodeAddresses(addresses []v1.NodeAddress) {
kl.lastObservedNodeAddresses = addresses
}
func (kl *Kubelet) getLastObservedNodeAddresses() []v1.NodeAddress {
kl.lastObservedNodeAddressesMux.Lock()
defer kl.lastObservedNodeAddressesMux.Unlock()
kl.lastObservedNodeAddressesMux.RLock()
defer kl.lastObservedNodeAddressesMux.RUnlock()
return kl.lastObservedNodeAddresses
}