github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 22:20:51 +00:00
Code Issues Projects Releases Wiki Activity

Tolerate volume being already-attached

Browse Source
This commit is contained in:
Justin Santa Barbara
2015-04-02 11:10:55 -07:00
parent 86ddc0f96a
commit ee72fa4d61
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/cloudprovider/aws/aws.go
View File

@@ -640,10 +640,12 @@ func (self *awsInstance) getInfo() (*ec2.Instance, error) {
return &resp.Reservations[0].Instances[0], nil return &resp.Reservations[0].Instances[0], nil
} }
func (self *awsInstance) assignMountDevice(volumeId string) (string, error) { // Assigns an unused mount device for the specified volume.
// If the volume is already assigned, this will return the existing mount device and true
func (self *awsInstance) assignMountDevice(volumeId string) (mountDevice string, alreadyAttached bool, err error) {
instanceType := self.getInstanceType() instanceType := self.getInstanceType()
if instanceType == nil { if instanceType == nil {
return "", fmt.Errorf("could not get instance type for instance: %s", self.awsId) return "", false, fmt.Errorf("could not get instance type for instance: %s", self.awsId)
} }
// We lock to prevent concurrent mounts from conflicting // We lock to prevent concurrent mounts from conflicting
@@ -656,7 +658,7 @@ func (self *awsInstance) assignMountDevice(volumeId string) (string, error) {
if self.deviceMappings == nil { if self.deviceMappings == nil {
info, err := self.getInfo() info, err := self.getInfo()
if err != nil { if err != nil {
return "", err return "", false, err
} }
deviceMappings := map[string]string{} deviceMappings := map[string]string{}
for _, blockDevice := range info.BlockDevices { for _, blockDevice := range info.BlockDevices {
@@ -669,7 +671,7 @@ func (self *awsInstance) assignMountDevice(volumeId string) (string, error) {
for deviceName, mappingVolumeId := range self.deviceMappings { for deviceName, mappingVolumeId := range self.deviceMappings {
if volumeId == mappingVolumeId { if volumeId == mappingVolumeId {
glog.Warningf("Got assignment call for already-assigned volume: %s@%s", deviceName, mappingVolumeId) glog.Warningf("Got assignment call for already-assigned volume: %s@%s", deviceName, mappingVolumeId)
return deviceName, nil return deviceName, true, nil
} }
} }
@@ -686,13 +688,13 @@ func (self *awsInstance) assignMountDevice(volumeId string) (string, error) {
if chosen == "" { if chosen == "" {
glog.Warningf("Could not assign a mount device (all in use?). mappings=%v, valid=%v", self.deviceMappings, valid) glog.Warningf("Could not assign a mount device (all in use?). mappings=%v, valid=%v", self.deviceMappings, valid)
return "", nil return "", false, nil
} }
self.deviceMappings[chosen] = volumeId self.deviceMappings[chosen] = volumeId
glog.V(2).Infof("Assigned mount device %s -> volume %s", chosen, volumeId) glog.V(2).Infof("Assigned mount device %s -> volume %s", chosen, volumeId)
return chosen, nil return chosen, false, nil
} }
func (self *awsInstance) releaseMountDevice(volumeId string, mountDevice string) { func (self *awsInstance) releaseMountDevice(volumeId string, mountDevice string) {
@@ -841,7 +843,7 @@ func (aws *AWSCloud) AttachDisk(instanceName string, diskName string, readOnly b
return errors.New("AWS volumes cannot be mounted read-only") return errors.New("AWS volumes cannot be mounted read-only")
} }
mountDevice, err := awsInstance.assignMountDevice(disk.awsId) mountDevice, alreadyAttached, err := awsInstance.assignMountDevice(disk.awsId)
if err != nil { if err != nil {
return err return err
} }
@@ -853,6 +855,7 @@ func (aws *AWSCloud) AttachDisk(instanceName string, diskName string, readOnly b
} }
}() }()
if !alreadyAttached {
attachResponse, err := aws.ec2.AttachVolume(disk.awsId, awsInstance.awsId, mountDevice) attachResponse, err := aws.ec2.AttachVolume(disk.awsId, awsInstance.awsId, mountDevice)
if err != nil { if err != nil {
// TODO: Check if already attached? // TODO: Check if already attached?
@@ -860,6 +863,7 @@ func (aws *AWSCloud) AttachDisk(instanceName string, diskName string, readOnly b
} }
glog.V(2).Info("AttachVolume request returned %v", attachResponse) glog.V(2).Info("AttachVolume request returned %v", attachResponse)
}
err = disk.waitForAttachmentStatus("attached") err = disk.waitForAttachmentStatus("attached")
if err != nil { if err != nil {