fixes

Author: alicelyy

aws/aws.go

@@ -34,6 +34,7 @@ const (
 	awsDevicePrefixWithH = "/dev/hd"
 	awsDevicePrefixNvme  = "/dev/nvme"
 	contextTimeout       = 30 * time.Second
+	awsErrorModificationNotFound = "InvalidVolumeModification.NotFound"
 )
 
 type awsOps struct {
@@ -942,37 +943,37 @@ func (s *awsOps) detachInternal(volumeID, instanceName string, options map[strin
 	return err
 }
 
-func (s *awsOps) getVolumeModificationState(volumeID string) (string, error) {
+func isErrorModificationNotFound(err error) bool {
+	return strings.HasPrefix(err.Error(), awsErrorModificationNotFound)
+}
+
+func (s *awsOps) IsVolumesReadyToExpand(volumeIDs []*string) (bool, error) {
 	modificationStateRequest := &ec2.DescribeVolumesModificationsInput{
-		VolumeIds: []*string{&volumeID},
+		VolumeIds: volumeIDs,
 	}
 	describeOutput, err := s.ec2.DescribeVolumesModifications(modificationStateRequest)
+	states := describeOutput.VolumesModifications
 	if err != nil {
-		return "", err
-	}
-	volumeModifications := describeOutput.VolumesModifications
-	if len(volumeModifications) == 0 {
-		return "", nil
+		// modification state not found, this indicates no change has occurred before.
+		if isErrorModificationNotFound(err) {
+			return true, nil
+		}
+		return false, fmt.Errorf("unable to get volumes' modification states: %v", err)
 	}
 
-	volumeModification := volumeModifications[len(volumeModifications)-1]
-	state := *volumeModification.ModificationState
-	return state, nil
-}
-
-func (s *awsOps) IsVolumesReadyToExpand(volumeIDs []string) (bool, error) {
-	for i := 0; i < len(volumeIDs); i++ {
-		state, err := s.getVolumeModificationState(volumeIDs[i])
-		if err != nil {
-			return false, fmt.Errorf("unable to get modification state: #{err}. ")
-		}
-		// Empty string indicates there was no volume change
-		if state == "" {
-			return true, nil
+	var state string
+	for i := 0; i < len(states); i++ {
+		if states[i] == nil || states[i].ModificationState == nil {
+			logrus.Infof("volume modification state is nil for volume id: %s", state, *volumeIDs[i])
+			continue
 		}
+
+		state = *states[i].ModificationState
+		logrus.Infof("retrived volume modification state: %s for volume id: %s", state, *volumeIDs[i])
 		if state == ec2.VolumeModificationStateModifying ||
 			state == ec2.VolumeModificationStateOptimizing {
-			return false, fmt.Errorf("the last modification has not fully completed. ")
+			return false, fmt.Errorf("aws has not fully completed the last modification: " +
+				"volume %s is in %s state. please retry later", *volumeIDs[i], state)
 		}
 	}
 	return true, nil

azure/azure.go

@@ -580,9 +580,9 @@ func (a *azureOps) DeleteFrom(diskName, _ string) error {
 	return a.Delete(diskName, nil)
 }
 
-func (a *azureOps) IsVolumesReadyToExpand(volumeIDs []string) (bool, error) {
+func (a *azureOps) IsVolumesReadyToExpand(volumeIDs []*string) (bool, error) {
 	return true, &cloudops.ErrNotSupported{
-		Operation: "IsVolumesReadyToExpand",
+		Operation: "azureOps.IsVolumesReadyToExpand",
 	}
 }
 

backoff/exponential.go

@@ -436,12 +436,11 @@ func (e *exponentialBackoff) DevicePath(volumeID string) (string, error) {
 	return devicePath, origErr
 }
 
-func (e *exponentialBackoff) IsVolumesReadyToExpand(volumeIDs []string) (bool, error) {
-	return true, &cloudops.ErrNotSupported{
-		Operation: "IsVolumesReadyToExpand",
-	}
+func (e *exponentialBackoff) IsVolumesReadyToExpand(volumeIDs []*string) (bool, error) {
+	return e.cloudOps.IsVolumesReadyToExpand(volumeIDs)
 }
 
+
 func (e *exponentialBackoff) Expand(volumeID string, targetSize uint64, options map[string]string) (uint64, error) {
 	var (
 		actualSize uint64

cloudops.go

@@ -131,7 +131,7 @@ type Storage interface {
 	Attach(volumeID string, options map[string]string) (string, error)
 	// IsVolumeReadyToExpand pre-checks if the volume is in a state that can be modified. Should be called
 	// before issue an expand request to the cloud provider
-	IsVolumesReadyToExpand(volumeIDs []string) (bool, error)
+	IsVolumesReadyToExpand(volumeIDs []*string) (bool, error)
 	// Expand expands the provided device from the existing size to the new size
 	// It returns the new size of the device. It is a blocking API where it will
 	// only return once the requested size is validated with the cloud provider or

gce/gce.go

@@ -664,9 +664,9 @@ func (s *gceOps) GetDeviceID(disk interface{}) (string, error) {
 	}
 }
 
-func (s *gceOps) IsVolumesReadyToExpand(volumeIDs []string) (bool, error) {
+func (s *gceOps) IsVolumesReadyToExpand(volumeIDs []*string) (bool, error) {
 	return true, &cloudops.ErrNotSupported{
-		Operation: "IsVolumesReadyToExpand",
+		Operation: "gceOps:IsVolumesReadyToExpand",
 	}
 }
 func (s *gceOps) Expand(

mock/cloudops.mock.go

@@ -829,9 +829,9 @@ func nodePoolContainsNode(s []containerengine.Node, e string) bool {
 	return false
 }
 
-func (o *oracleOps) IsVolumesReadyToExpand(volumeIDs []string) (bool, error) {
+func (o *oracleOps) IsVolumesReadyToExpand(volumeIDs []*string) (bool, error) {
 	return true, &cloudops.ErrNotSupported{
-		Operation: "IsVolumesReadyToExpand",
+		Operation: "oracleOps:IsVolumesReadyToExpand",
 	}
 }
 

oracle/oracle.go

@@ -100,9 +100,9 @@ func (u *unsupportedStorage) Attach(volumeID string, options map[string]string)
 	}
 }
 
-func (u *unsupportedStorage) IsVolumesReadyToExpand(volumeIDs []string) (bool, error) {
+func (u *unsupportedStorage) IsVolumesReadyToExpand(volumeIDs []*string) (bool, error) {
 	return true, &cloudops.ErrNotSupported{
-		Operation: "IsVolumesReadyToExpand",
+		Operation: "unsupportedStorage:IsVolumesReadyToExpand",
 	}
 }
 

unsupported/unsupported.go

@@ -533,9 +533,9 @@ func (ops *vsphereOps) Enumerate(volumeIds []*string,
 	}
 }
 
-func (ops *vsphereOps) IsVolumesReadyToExpand(volumeIDs []string) (bool, error) {
+func (ops *vsphereOps) IsVolumesReadyToExpand(volumeIDs []*string) (bool, error) {
 	return true, &cloudops.ErrNotSupported{
-		Operation: "IsVolumesReadyToExpand",
+		Operation: "vsphereOps:IsVolumesReadyToExpand",
 	}
 }