Fix cluster meta data existing (#5001) (#5111)

Signed-off-by: BornChanger <[email protected]> Co-authored-by: BornChanger <[email protected]> Co-authored-by: Xuecheng Zhang <[email protected]>
pingcap · Jun 30, 2023 · 506b3bd · 506b3bd
1 parent f0d841f
commit 506b3bd
Showing 1 changed file with 20 additions and 8 deletions.
diff --git a/pkg/backup/backup/backup_manager.go b/pkg/backup/backup/backup_manager.go
@@ -258,14 +258,26 @@ func (bm *backupManager) makeBackupJob(backup *v1alpha1.Backup) (*batchv1.Job, *
 		// not found backup job, so we need to create it
 		job, reason, err = bm.makeBRBackupJob(backup)
 		if err != nil {
-			bm.statusUpdater.Update(backup, &v1alpha1.BackupCondition{
-				Command: logBackupSubcommand,
-				Type:    v1alpha1.BackupRetryTheFailed,
-				Status:  corev1.ConditionTrue,
-				Reason:  reason,
-				Message: err.Error(),
-			}, nil)
-			return nil, nil, "", err
+			// don't retry on dup metadata file existing error
+			if reason == "FileExistedInExternalStorage" {
+				bm.statusUpdater.Update(backup, &v1alpha1.BackupCondition{
+					Command: logBackupSubcommand,
+					Type:    v1alpha1.BackupFailed,
+					Status:  corev1.ConditionTrue,
+					Reason:  reason,
+					Message: err.Error(),
+				}, nil)
+				return nil, nil, "", controller.IgnoreErrorf("%s, reason is %s", err.Error(), reason)
+			} else {
+				bm.statusUpdater.Update(backup, &v1alpha1.BackupCondition{
+					Command: logBackupSubcommand,
+					Type:    v1alpha1.BackupRetryTheFailed,
+					Status:  corev1.ConditionTrue,
+					Reason:  reason,
+					Message: err.Error(),
+				}, nil)
+				return nil, nil, "", err
+			}
 		}
 
 		if logBackupSubcommand == v1alpha1.LogStartCommand {