Merge pull request #50042 from jingxu97/Aug/cinderfix

Kubernetes Submit Queue · web-flow · commit ba4e874f78b4 · 2017-08-07T10:58:59.000-07:00
Automatic merge from submit-queue (batch tested with PRs 50087, 39587, 50042, 50241, 49914)

AttachDisk should not call detach inside of Cinder volume provider
diff --git a/pkg/cloudprovider/providers/openstack/openstack_volumes.go b/pkg/cloudprovider/providers/openstack/openstack_volumes.go
@@ -230,11 +230,9 @@ func (os *OpenStack) AttachDisk(instanceID, volumeID string) (string, error) {
 			glog.V(4).Infof("Disk %s is already attached to instance %s", volumeID, instanceID)
 			return volume.ID, nil
 		}
-		glog.V(2).Infof("Disk %s is attached to a different instance (%s), detaching", volumeID, volume.AttachedServerId)
-		err = os.DetachDisk(volume.AttachedServerId, volumeID)
-		if err != nil {
-			return "", err
-		}
+		errmsg := fmt.Sprintf("Disk %s is attached to a different instance (%s)", volumeID, volume.AttachedServerId)
+		glog.V(2).Infof(errmsg)
+		return "", errors.New(errmsg)
 	}
 
 	startTime := time.Now()

Original file line number	Diff line number	Diff line change
`@@ -230,11 +230,9 @@ func (os *OpenStack) AttachDisk(instanceID, volumeID string) (string, error) {`
`230`	`230`	`glog.V(4).Infof("Disk %s is already attached to instance %s", volumeID, instanceID)`
`231`	`231`	`return volume.ID, nil`
`232`	`232`	`}`
`233`		`- glog.V(2).Infof("Disk %s is attached to a different instance (%s), detaching", volumeID, volume.AttachedServerId)`
`234`		`- err = os.DetachDisk(volume.AttachedServerId, volumeID)`
`235`		`- if err != nil {`
`236`		`- return "", err`
`237`		`- }`
	`233`	`+ errmsg := fmt.Sprintf("Disk %s is attached to a different instance (%s)", volumeID, volume.AttachedServerId)`
	`234`	`+ glog.V(2).Infof(errmsg)`
	`235`	`+ return "", errors.New(errmsg)`
`238`	`236`	`}`
`239`	`237`
`240`	`238`	`startTime := time.Now()`