Skip to content

K
k3s
Commit d6cb4827 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #50042 from jingxu97/Aug/cinderfix

Automatic merge from submit-queue (batch tested with PRs 50087, 39587, 50042, 50241, 49914) AttachDisk should not call detach inside of Cinder volume provider
parents 59b8fa32 8ffc3615
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
pkg/cloudprovider/providers/openstack/openstack_volumes.go
View file @ d6cb4827
...@@ -230,11 +230,9 @@ func (os *OpenStack) AttachDisk(instanceID, volumeID string) (string, error) { ...@@ -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) glog.V(4).Infof("Disk %s is already attached to instance %s", volumeID, instanceID)
return volume.ID, nil return volume.ID, nil
} }
glog.V(2).Infof("Disk %s is attached to a different instance (%s), detaching", volumeID, volume.AttachedServerId) errmsg := fmt.Sprintf("Disk %s is attached to a different instance (%s)", volumeID, volume.AttachedServerId)
err = os.DetachDisk(volume.AttachedServerId, volumeID) glog.V(2).Infof(errmsg)
if err != nil { return "", errors.New(errmsg)
return "", err
}
} }
startTime := time.Now() startTime := time.Now()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment