github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #45192 from cehoffman/azure_deadlock 

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Prevent deadlock on azure zone fetch in presence of failure

**What this PR does / why we need it**:

This fixes a bug in the Zone get function for the Azure cloud provider.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
Fix deadlock in azure cloud provider zone fetching
```
pull/6/head
Kubernetes Submit Queue 2017-12-08 11:50:34 -08:00 committed by GitHub
parent 8583b6639d 04e2deeb28
commit a6741ea743
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,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()
@ -55,7 +56,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
} }