Merge pull request #60183 from andyzhangx/addlock-detach-azuredisk

Automatic merge from submit-queue (batch tested with PRs 60208, 60084, 60183, 59713, 60096). 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>. fix race condition issue when detaching azure disk **What this PR does / why we need it**: add lock before detaching azure disk, without this PR, there would be lots of `Multi-Attach error` when scheduling one pod from one node to another. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #60101 **Special notes for your reviewer**: @feiskyer @djsly @khenidak Since we are using `getLunMutex.LockKey(instanceid)` for both AttachDisk and DetachDisk, there would be only one VM.update operation at a time for both AttachDisk and DetachDisk. **Release note**: ``` fix race condition issue when detaching azure disk ``` /assign @feiskyer Could you also mark as v1.10 milestone @feiskyer thanks. /sig azure

Merge pull request #60183 from andyzhangx/addlock-detach-azuredisk
8f9e8c0a · Kubernetes Submit Queue · GitHub · 32fbec0c · f3324a6c · 8f9e8c0a
Unverified Commit 8f9e8c0a authored Feb 22, 2018 by Kubernetes Submit Queue Committed by GitHub Feb 22, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

attacher.go pkg/volume/azure_dd/attacher.go +5 -1

No files found.
--- a/pkg/volume/azure_dd/attacher.go
+++ b/pkg/volume/azure_dd/attacher.go
@@ -268,7 +268,7 @@ func (d *azureDiskDetacher) Detach(diskURI string, nodeName types.NodeName) erro
 		return fmt.Errorf("invalid disk to detach: %q", diskURI)
 	}

-	_, err := d.cloud.InstanceID(context.TODO(), nodeName)
+	instanceid, err := d.cloud.InstanceID(context.TODO(), nodeName)
 	if err != nil {
 		glog.Warningf("no instance id for node %q, skip detaching (%v)", nodeName, err)
 		return nil
@@ -280,6 +280,10 @@ func (d *azureDiskDetacher) Detach(diskURI string, nodeName types.NodeName) erro
 	if err != nil {
 		return err
 	}
+
+	getLunMutex.LockKey(instanceid)
+	defer getLunMutex.UnlockKey(instanceid)
+
 	err = diskController.DetachDiskByName("", diskURI, nodeName)
 	if err != nil {
 		glog.Errorf("failed to detach azure disk %q, err %v", diskURI, err)