[fix] allow delete volume when status is error

cuongpiger · cuongpiger · commit b9d3c8d9a042 · 2024-06-20T09:36:24.000+07:00
diff --git a/pkg/cloud/cloud.go b/pkg/cloud/cloud.go
@@ -144,7 +144,7 @@ func (s *cloud) DeleteVolume(volID string) error {
 	}
 
 	if vol.CanDelete() {
-		_, err := s.waitVolumeAchieveStatus(volID, volumeAvailableStatus)
+		_, err := s.waitVolumeAchieveStatus(volID, availableDeleteStatus)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/cloud/consts.go b/pkg/cloud/consts.go
@@ -52,6 +52,7 @@ var (
 var (
 	volumeArchivedStatus  = lset.NewSet[string](VolumeAvailableStatus, VolumeInUseStatus)
 	volumeAvailableStatus = lset.NewSet[string](VolumeAvailableStatus)
+	availableDeleteStatus = lset.NewSet[string](VolumeAvailableStatus, VolumeErrorStatus)
 )
 
 const (

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ func (s *cloud) DeleteVolume(volID string) error {`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`if vol.CanDelete() {`
`147`		`- _, err := s.waitVolumeAchieveStatus(volID, volumeAvailableStatus)`
	`147`	`+ _, err := s.waitVolumeAchieveStatus(volID, availableDeleteStatus)`
`148`	`148`	`if err != nil {`
`149`	`149`	`return err`
`150`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ var (`
`52`	`52`	`var (`
`53`	`53`	`volumeArchivedStatus = lset.NewSet[string](VolumeAvailableStatus, VolumeInUseStatus)`
`54`	`54`	`volumeAvailableStatus = lset.NewSet[string](VolumeAvailableStatus)`
	`55`	`+ availableDeleteStatus = lset.NewSet[string](VolumeAvailableStatus, VolumeErrorStatus)`
`55`	`56`	`)`
`56`	`57`
`57`	`58`	`const (`