github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #90576 from gaurav1086/azure_optimize_locks

Browse Source 
[Provider/Azure] optimize mutex locks
This commit is contained in:
Kubernetes Prow Robot 2020-06-29 07:07:24 -07:00 committed by GitHub
commit ec36ff4001
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
staging/src/k8s.io/legacy-cloud-providers/azure/azure.go
View File

@ -253,7 +253,7 @@ type Cloud struct {
// ipv6DualStack allows overriding for unit testing. It's normally initialized from featuregates // ipv6DualStack allows overriding for unit testing. It's normally initialized from featuregates
ipv6DualStackEnabled bool ipv6DualStackEnabled bool
// Lock for access to node caches, includes nodeZones, nodeResourceGroups, and unmanagedNodes. // Lock for access to node caches, includes nodeZones, nodeResourceGroups, and unmanagedNodes.
nodeCachesLock sync.Mutex nodeCachesLock sync.RWMutex
// nodeZones is a mapping from Zone to a sets.String of Node's names in the Zone // nodeZones is a mapping from Zone to a sets.String of Node's names in the Zone
// it is updated by the nodeInformer // it is updated by the nodeInformer
nodeZones map[string]sets.String nodeZones map[string]sets.String
@ -812,8 +812,8 @@ func (az *Cloud) GetActiveZones() (sets.String, error) {
return nil, fmt.Errorf("Azure cloud provider doesn't have informers set") return nil, fmt.Errorf("Azure cloud provider doesn't have informers set")
} }
az.nodeCachesLock.Lock() az.nodeCachesLock.RLock()
defer az.nodeCachesLock.Unlock() defer az.nodeCachesLock.RUnlock()
if !az.nodeInformerSynced() { if !az.nodeInformerSynced() {
return nil, fmt.Errorf("node informer is not synced when trying to GetActiveZones") return nil, fmt.Errorf("node informer is not synced when trying to GetActiveZones")
} }
@ -839,8 +839,8 @@ func (az *Cloud) GetNodeResourceGroup(nodeName string) (string, error) {
return az.ResourceGroup, nil return az.ResourceGroup, nil
} }
az.nodeCachesLock.Lock() az.nodeCachesLock.RLock()
defer az.nodeCachesLock.Unlock() defer az.nodeCachesLock.RUnlock()
if !az.nodeInformerSynced() { if !az.nodeInformerSynced() {
return "", fmt.Errorf("node informer is not synced when trying to GetNodeResourceGroup") return "", fmt.Errorf("node informer is not synced when trying to GetNodeResourceGroup")
} }
@ -861,8 +861,8 @@ func (az *Cloud) GetResourceGroups() (sets.String, error) {
return sets.NewString(az.ResourceGroup), nil return sets.NewString(az.ResourceGroup), nil
} }
az.nodeCachesLock.Lock() az.nodeCachesLock.RLock()
defer az.nodeCachesLock.Unlock() defer az.nodeCachesLock.RUnlock()
if !az.nodeInformerSynced() { if !az.nodeInformerSynced() {
return nil, fmt.Errorf("node informer is not synced when trying to GetResourceGroups") return nil, fmt.Errorf("node informer is not synced when trying to GetResourceGroups")
} }
@ -882,8 +882,8 @@ func (az *Cloud) GetUnmanagedNodes() (sets.String, error) {
return nil, nil return nil, nil
} }
az.nodeCachesLock.Lock() az.nodeCachesLock.RLock()
defer az.nodeCachesLock.Unlock() defer az.nodeCachesLock.RUnlock()
if !az.nodeInformerSynced() { if !az.nodeInformerSynced() {
return nil, fmt.Errorf("node informer is not synced when trying to GetUnmanagedNodes") return nil, fmt.Errorf("node informer is not synced when trying to GetUnmanagedNodes")
} }