add volume check

Author: alicelyy

aws/aws.go

@@ -942,6 +942,42 @@ func (s *awsOps) detachInternal(volumeID, instanceName string, options map[strin
 	return err
 }
 
+func (s *awsOps) getVolumeModificationState(volumeID string) (string, error) {
+	modificationStateRequest := &ec2.DescribeVolumesModificationsInput{
+		VolumeIds: []*string{&volumeID},
+	}
+	describeOutput, err := s.ec2.DescribeVolumesModifications(modificationStateRequest)
+	if err != nil {
+		return "", err
+	}
+	volumeModifications := describeOutput.VolumesModifications
+	if len(volumeModifications) == 0 {
+		return "", nil
+	}
+
+	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
+		}
+		if state == ec2.VolumeModificationStateModifying ||
+			state == ec2.VolumeModificationStateOptimizing {
+			return false, fmt.Errorf("the last modification has not fully completed. ")
+		}
+	}
+	return true, nil
+}
+
 func (s *awsOps) Expand(
 	volumeID string,
 	newSizeInGiB uint64,

azure/azure.go

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

backoff/exponential.go

@@ -436,6 +436,12 @@ 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) Expand(volumeID string, targetSize uint64, options map[string]string) (uint64, error) {
 	var (
 		actualSize uint64

cloudops.go

@@ -129,6 +129,9 @@ type Storage interface {
 	// Attach volumeID, accepts attachoOptions as opaque data
 	// Return attach path.
 	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)
 	// 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,6 +664,11 @@ func (s *gceOps) GetDeviceID(disk interface{}) (string, error) {
 	}
 }
 
+func (s *gceOps) IsVolumesReadyToExpand(volumeIDs []string) (bool, error) {
+	return true, &cloudops.ErrNotSupported{
+		Operation: "IsVolumesReadyToExpand",
+	}
+}
 func (s *gceOps) Expand(
 	volumeID string,
 	newSizeInGiB uint64,

oracle/oracle.go

@@ -293,7 +293,7 @@ func (o *oracleOps) GetInstance(displayName string) (interface{}, error) {
 	if len(listInstanceResp.Items) == 0 {
 		return nil, fmt.Errorf("no oracle instance found with display name: %s", displayName)
 	}
-	// Currently, torpedo uses this API to fetch details of the instance created 
+	// Currently, torpedo uses this API to fetch details of the instance created
 	// by OKE. OKE ensures that all the worker nodes created, have unique display
 	// names. In future, if we require to use this API to get details of vanilla
 	// compute instances, then we can modify below array indexing.
@@ -829,6 +829,12 @@ func nodePoolContainsNode(s []containerengine.Node, e string) bool {
 	return false
 }
 
+func (o *oracleOps) IsVolumesReadyToExpand(volumeIDs []string) (bool, error) {
+	return true, &cloudops.ErrNotSupported{
+		Operation: "IsVolumesReadyToExpand",
+	}
+}
+
 func (o *oracleOps) Expand(volumeID string, newSizeInGiB uint64, options map[string]string) (uint64, error) {
 	logrus.Debug("Expand volume to size ", newSizeInGiB, " GiB")
 

unsupported/unsupported.go

@@ -99,6 +99,13 @@ func (u *unsupportedStorage) Attach(volumeID string, options map[string]string)
 		Operation: "Attach",
 	}
 }
+
+func (u *unsupportedStorage) IsVolumesReadyToExpand(volumeIDs []string) (bool, error) {
+	return true, &cloudops.ErrNotSupported{
+		Operation: "IsVolumesReadyToExpand",
+	}
+}
+
 func (u *unsupportedStorage) Expand(volumeID string, newSizeInGiB uint64, options map[string]string) (uint64, error) {
 	return 0, &cloudops.ErrNotSupported{
 		Operation: "Expand",

vsphere/vsphere.go

@@ -476,7 +476,7 @@ func (ops *vsphereOps) DeviceMappings() (map[string]string, error) {
 			if ok {
 				diskUUID, err := vmObj.Datacenter.GetVirtualDiskPage83Data(ctx, backing.FileName)
 				if err != nil {
-					vmName,_ := vmObj.ObjectName(ctx)
+					vmName, _ := vmObj.ObjectName(ctx)
 					return nil, fmt.Errorf("failed to get device path for disk: %s on vm: %s err: %s", backing.FileName, vmName, err)
 				}
 
@@ -533,6 +533,12 @@ func (ops *vsphereOps) Enumerate(volumeIds []*string,
 	}
 }
 
+func (ops *vsphereOps) IsVolumesReadyToExpand(volumeIDs []string) (bool, error) {
+	return true, &cloudops.ErrNotSupported{
+		Operation: "IsVolumesReadyToExpand",
+	}
+}
+
 func (ops *vsphereOps) Expand(
 	vmdkPath string,
 	newSizeInGiB uint64,