disk/snapshot: map create error code

kubernetes-sigs · Dec 19, 2024 · d04dd88 · d04dd88
1 parent c3fe68f
commit d04dd88
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/pkg/disk/cloud.go b/pkg/disk/cloud.go
@@ -891,7 +891,16 @@ func requestAndCreateSnapshot(ecsClient *ecs.Client, params *createSnapshotParam
 	// Do Snapshot create
 	snapshotResponse, err := ecsClient.CreateSnapshot(createSnapshotRequest)
 	if err != nil {
-		return nil, fmt.Errorf("create snapshot %s failed: %v", params.SnapshotName, err)
+		var aliErr *alicloudErr.ServerError
+		if errors.As(err, &aliErr) {
+			switch aliErr.ErrorCode() {
+			case IdempotentParameterMismatch:
+				return nil, status.Errorf(codes.AlreadyExists, "already created but parameter mismatch (RequestID: %s)", aliErr.RequestId())
+			case QuotaExceed_Snapshot:
+				return nil, status.Errorf(codes.ResourceExhausted, "snapshot quota exceeded: %v", err)
+			}
+		}
+		return nil, status.Errorf(codes.Internal, "create snapshot failed: %v", err)
 	}
 	return snapshotResponse, nil
 }

diff --git a/pkg/disk/constants.go b/pkg/disk/constants.go
@@ -90,6 +90,8 @@ const (
 	SnapshotNotFound             = "InvalidSnapshotId.NotFound"
 	InstanceNotFound             = "InvalidInstanceId.NotFound"
 
+	QuotaExceed_Snapshot = "QuotaExceed.Snapshot"
+
 	// DiskHighAvail tag
 	DiskHighAvail = "available"
 	// MBSIZE tag

diff --git a/pkg/disk/controllerserver.go b/pkg/disk/controllerserver.go
@@ -567,7 +567,7 @@ func (cs *controllerServer) CreateSnapshot(ctx context.Context, req *csi.CreateS
 	snapshotResponse, err := requestAndCreateSnapshot(ecsClient, params)
 
 	if err != nil {
-		return nil, status.Errorf(codes.Internal, "create snapshot[%s] with sourceId[%s] failed with error: %v", req.Name, req.GetSourceVolumeId(), err)
+		return nil, err
 	}
 
 	klog.Infof("CreateSnapshot:: Snapshot create successful: snapshotName[%s], sourceId[%s], snapshotId[%s]", req.Name, req.GetSourceVolumeId(), snapshotResponse.SnapshotId)