AWS: Do not ignore errors from EC2::DescribeVolumee in DetachDisk

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.

AWS: Do not ignore errors from EC2::DescribeVolumee in DetachDisk
c879e531 · Tomas Smetana · b922ffc4 · c879e531
Commit c879e531 authored Feb 08, 2018 by Tomas Smetana
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

aws.go pkg/cloudprovider/providers/aws/aws.go +1 -1

No files found.
--- a/pkg/cloudprovider/providers/aws/aws.go
+++ b/pkg/cloudprovider/providers/aws/aws.go
@@ -2013,7 +2013,7 @@ func (c *Cloud) AttachDisk(diskName KubernetesVolumeID, nodeName types.NodeName,
 // DetachDisk implements Volumes.DetachDisk
 func (c *Cloud) DetachDisk(diskName KubernetesVolumeID, nodeName types.NodeName) (string, error) {
 	diskInfo, attached, err := c.checkIfAttachedToNode(diskName, nodeName)
-	if diskInfo == nil {
+	if err != nil {
 		return "", err
 	}