github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 18:00:08 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/kubelet.go
View File

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

4
pkg/kubelet/kubelet_node_status.go
View File

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