scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-11 09:06:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent deadlock on azure zone fetch in presence of failure

Browse Source
This commit is contained in:
Chris Hoffman
2017-05-01 17:12:12 -05:00
parent 07424af12b
commit 04e2deeb28
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cloudprovider/providers/azure/azure_zones.go
View File

@@ -40,6 +40,7 @@ type instanceInfo struct {
// GetZone returns the Zone containing the current failure zone and locality region that the program is running in // GetZone returns the Zone containing the current failure zone and locality region that the program is running in
func (az *Cloud) GetZone() (cloudprovider.Zone, error) { func (az *Cloud) GetZone() (cloudprovider.Zone, error) {
faultMutex.Lock() faultMutex.Lock()
defer faultMutex.Unlock()
if faultDomain == nil { if faultDomain == nil {
var err error var err error
faultDomain, err = fetchFaultDomain() faultDomain, err = fetchFaultDomain()
@@ -51,7 +52,6 @@ func (az *Cloud) GetZone() (cloudprovider.Zone, error) {
FailureDomain: *faultDomain, FailureDomain: *faultDomain,
Region: az.Location, Region: az.Location,
} }
faultMutex.Unlock()
return zone, nil return zone, nil
} }