Clarify the conditions

pingcap · Sep 27, 2024 · ff7210e · ff7210e
1 parent 0a8b093
commit ff7210e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/pkg/apis/pingcap/v1alpha1/backup.go b/pkg/apis/pingcap/v1alpha1/backup.go
@@ -296,7 +296,8 @@ func IsLogBackupStopped(backup *Backup) bool {
 
 // IsBackupClean returns true if a Backup has been successfully cleaned up
 func IsBackupClean(backup *Backup) bool {
-	if backup.Spec.Mode == BackupModeLog && !IsLogBackupAlreadyStop(backup){
+	// TODO: now we don't handle fault state, maybe we should consider it in the future
+	if backup.Spec.Mode == BackupModeLog && IsLogBackupOnTrack(backup) {
 		return false
 	}
 	if NeedRetainData(backup) {
@@ -402,3 +403,11 @@ func IsLogBackupAlreadyTruncate(backup *Backup) bool {
 func IsLogBackupAlreadyStop(backup *Backup) bool {
 	return backup.Spec.Mode == BackupModeLog && backup.Status.Phase == BackupStopped
 }
+
+// IsLogBackupOnTrack return whether log backup is on track.
+func IsLogBackupOnTrack(backup *Backup) bool {
+	return backup.Spec.Mode == BackupModeLog && 
+		backup.Status.Phase == BackupScheduled || 
+		backup.Status.Phase == BackupPrepare || 
+		backup.Status.Phase == BackupRunning
+}
diff --git a/pkg/backup/backup/backup_cleaner.go b/pkg/backup/backup/backup_cleaner.go
@@ -187,7 +187,7 @@ func (bc *backupCleaner) CleanLogBackup(backup *v1alpha1.Backup) error {
 
 	return bc.statusUpdater.Update(backup, &v1alpha1.BackupCondition{
 		Command: v1alpha1.LogStopCommand,
-		Type:    v1alpha1.BackupComplete,
+		Type:    v1alpha1.BackupScheduled,
 		Status:  corev1.ConditionTrue,
 	}, nil)
 }