adding checks for delete in progress (#1104)

kanisterio · Sep 24, 2021 · 491f0b2 · 491f0b2
1 parent a44b47f
commit 491f0b2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/pkg/blockstorage/awsefs/awsefs.go b/pkg/blockstorage/awsefs/awsefs.go
@@ -448,6 +448,9 @@ func (e *efs) SnapshotDelete(ctx context.Context, snapshot *blockstorage.Snapsho
 	if isResourceNotFoundException(err) {
 		return nil
 	}
+	if isDeleteInProgress(err) {
+		return nil
+	}
 	return err
 }
 

diff --git a/pkg/blockstorage/awsefs/error.go b/pkg/blockstorage/awsefs/error.go
@@ -15,6 +15,8 @@
 package awsefs
 
 import (
+	"strings"
+
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/backup"
 	awsefs "github.com/aws/aws-sdk-go/service/efs"
@@ -50,3 +52,13 @@ func isMountTargetNotFound(err error) bool {
 	}
 	return false
 }
+
+func isDeleteInProgress(err error) bool {
+	if awsErr, ok := err.(awserr.Error); ok {
+		if awsErr.Code() == backup.ErrCodeInvalidRequestException &&
+			strings.Contains(awsErr.Message(), "Recovery point already started the deletion process") {
+			return true
+		}
+	}
+	return false
+}