Skip to content

Commit

Permalink
Merge pull request #18544 from tsmetana/fix-aws-detach
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue (batch tested with PRs 18498, 18544, 18479, 18547).

UPSTREAM: 59569: Do not ignore errors from EC2::DescribeVolume

The DetachDisk method of AWS cloudprovider indirectly calls
EC2::DescribeVolume AWS API function to check if the volume
being detached is really attached to the specified node.

The AWS API call may fail and return error which is logged however
the DetachDisk then finishes successfully. This may cause the AWS
volumes to remain attached to the instances forever because the
attach/detach controller will mark the volume as attached. The PV
controller will never be able to delete those disks and they need
to be detached manually.

This patch ensures on error from DescribeVolume is propagated to
attach/detach controller and the detach operation is re-tried.

Related bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1537236
  • Loading branch information
openshift-merge-robot authored Feb 9, 2018
2 parents 3b9b959 + 15c1c88 commit a7914ef
Showing 1 changed file with 1 addition and 1 deletion.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a7914ef

Please sign in to comment.