Refine Delete API (#376)

Signed-off-by: wayblink <[email protected]>
zilliztech · Jul 5, 2024 · 80cd2b9 · 80cd2b9
1 parent 197ad69
commit 80cd2b9
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/core/backup_context.go b/core/backup_context.go
@@ -392,6 +392,9 @@ func (b *BackupContext) DeleteBackup(ctx context.Context, request *backuppb.Dele
 	getResp := b.GetBackup(b.ctx, &backuppb.GetBackupRequest{
 		BackupName: request.GetBackupName(),
 	})
+	// always trigger a remove to make sure it is deleted
+	err := b.getStorageClient().RemoveWithPrefix(ctx, b.backupBucketName, BackupDirPath(b.backupRootPath, request.GetBackupName()))
+
 	if getResp.GetCode() == backuppb.ResponseCode_Request_Object_Not_Found {
 		resp.Code = backuppb.ResponseCode_Request_Object_Not_Found
 		resp.Msg = getResp.GetMsg()
@@ -409,11 +412,11 @@ func (b *BackupContext) DeleteBackup(ctx context.Context, request *backuppb.Dele
 		return resp
 	}
 
-	err := b.getStorageClient().RemoveWithPrefix(ctx, b.backupBucketName, BackupDirPath(b.backupRootPath, request.GetBackupName()))
-
 	if err != nil {
 		log.Error("Fail to delete backup", zap.String("backupName", request.GetBackupName()), zap.Error(err))
-		return nil
+		resp.Code = backuppb.ResponseCode_Fail
+		resp.Msg = getResp.GetMsg()
+		return resp
 	}
 
 	resp.Code = backuppb.ResponseCode_Success