github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14493 from BugRoger/fix_devicemapping_cache_invalidation

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-10-29 06:43:10 -07:00
commit 45028e8c3d
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/cloudprovider/providers/aws/aws.go
View File

@ -1122,7 +1122,7 @@ func (aws *AWSCloud) AttachDisk(instanceName string, diskName string, readOnly b
attached := false
defer func() {
if !attached {
awsInstance.releaseMountDevice(disk.awsID, ec2Device)
awsInstance.releaseMountDevice(disk.awsID, mountpoint)
}
}()
@ -1170,6 +1170,24 @@ func (aws *AWSCloud) DetachDisk(instanceName string, diskName string) error {
if response == nil {
return errors.New("no response from DetachVolume")
}
// At this point we are waiting for the volume being detached. This
// releases the volume and invalidates the cache even when there is a timeout.
//
// TODO: A timeout leaves the cache in an inconsistent state. The volume is still
// detaching though the cache shows it as ready to be attached again. Subsequent
// attach operations will fail. The attach is being retried and eventually
// works though. An option would be to completely flush the cache upon timeouts.
//
defer func() {
for mountDevice, existingVolumeID := range awsInstance.deviceMappings {
if existingVolumeID == disk.awsID {
awsInstance.releaseMountDevice(disk.awsID, mountDevice)
return
}
}
}()
err = disk.waitForAttachmentStatus("detached")
if err != nil {
return err