rename ReadyToUse to SnapshotCaptured

Author: ushitora-anqou

api/v1/mantlebackup_types.go

@@ -57,12 +57,12 @@ type MantleBackupStatus struct {
 }
 
 const (
-	BackupConditionReadyToUse     = "ReadyToUse"
-	BackupConditionSyncedToRemote = "SyncedToRemote"
-	BackupConditionVerified       = "Verified"
+	BackupConditionSnapshotCaptured = "SnapshotCaptured"
+	BackupConditionSyncedToRemote   = "SyncedToRemote"
+	BackupConditionVerified         = "Verified"
 
-	// Reasons for ConditionReadyToUse
-	ConditionReasonReadyToUseNoProblem = "NoProblem"
+	// Reasons for ConditionSnapshotCaptured
+	ConditionReasonSnapshotCapturedNoProblem = "NoProblem"
 	// Reasons for ConditionSyncedToRemote
 	ConditionReasonSyncedToRemoteNoProblem = "NoProblem"
 	// Reasons for ConditionVerified
@@ -93,8 +93,8 @@ type MantleBackupList struct {
 	Items           []MantleBackup `json:"items"`
 }
 
-func (m *MantleBackup) IsReady() bool {
-	return meta.IsStatusConditionTrue(m.Status.Conditions, BackupConditionReadyToUse)
+func (m *MantleBackup) IsSnapshotCaptured() bool {
+	return meta.IsStatusConditionTrue(m.Status.Conditions, BackupConditionSnapshotCaptured)
 }
 
 func (m *MantleBackup) IsSynced() bool {

api/v1/mantlerestore_types.go

@@ -31,9 +31,9 @@ type MantleRestoreStatus struct {
 }
 
 const (
-	RestoreConditionReadyToUse = "ReadyToUse"
+	RestoreConditionSnapshotCaptured = "SnapshotCaptured"
 
-	// Reasons for ConditionReadyToUse
+	// Reasons for ConditionSnapshotCaptured
 	RestoreReasonNone = "NoProblem"
 )
 
@@ -50,8 +50,8 @@ type MantleRestore struct {
 	Status MantleRestoreStatus `json:"status,omitempty"`
 }
 
-func (m *MantleRestore) IsReady() bool {
-	return meta.IsStatusConditionTrue(m.Status.Conditions, RestoreConditionReadyToUse)
+func (m *MantleRestore) IsSnapshotCaptured() bool {
+	return meta.IsStatusConditionTrue(m.Status.Conditions, RestoreConditionSnapshotCaptured)
 }
 
 // +kubebuilder:object:root=true

docs/design.md

@@ -135,7 +135,7 @@ spec:
 status:
   conditions:
     # The corresponding backup data is ready to use if `status` is "True"
-    - type: "ReadyToUse"
+    - type: "SnapshotCaptured"
       status: "True"
 ```
 
@@ -185,6 +185,6 @@ spec:
 status:
   conditions:
     # The corresponding restore PV/PVC is ready to use if `status` is "True"
-    - type: "ReadyToUse"
+    - type: "SnapshotCaptured"
       status: "True"
 ```

internal/controller/mantlebackup_controller.go

@@ -462,7 +462,7 @@ func (r *MantleBackupReconciler) reconcileAsSecondary(ctx context.Context, backu
 		return ctrl.Result{}, err
 	}
 
-	if backup.IsReady() {
+	if backup.IsSnapshotCaptured() {
 		return r.secondaryCleanup(ctx, backup, true)
 	}
 
@@ -525,7 +525,7 @@ func (r *MantleBackupReconciler) replicate(
 		return ctrl.Result{}, err
 	}
 
-	if prepareResult.isSecondaryMantleBackupReadyToUse {
+	if prepareResult.isSecondaryMantleBackupSnapshotCaptured {
 		return r.primaryCleanup(ctx, backup)
 	}
 	return r.startExportAndUpload(ctx, backup, prepareResult)
@@ -772,7 +772,7 @@ func (r *MantleBackupReconciler) provisionRBDSnapshot(
 	}
 
 	// If the given MantleBackup is not ready to use, create a new RBD snapshot and update its status.
-	if backup.IsReady() {
+	if backup.IsSnapshotCaptured() {
 		return nil
 	}
 
@@ -801,7 +801,7 @@ func (r *MantleBackupReconciler) provisionRBDSnapshot(
 		backup.Status.SnapSize = &snapshot.Size
 
 		meta.SetStatusCondition(&backup.Status.Conditions, metav1.Condition{
-			Type: mantlev1.BackupConditionReadyToUse, Status: metav1.ConditionTrue, Reason: mantlev1.ConditionReasonReadyToUseNoProblem})
+			Type: mantlev1.BackupConditionSnapshotCaptured, Status: metav1.ConditionTrue, Reason: mantlev1.ConditionReasonSnapshotCapturedNoProblem})
 		return nil
 	}); err != nil {
 		logger.Error(err, "failed to update MantleBackup status", "status", backup.Status)
@@ -895,9 +895,9 @@ func (r *MantleBackupReconciler) finalizeSecondary(
 }
 
 type dataSyncPrepareResult struct {
-	isIncremental                     bool // NOTE: The value is forcibly set to false if isSecondaryMantleBackupReadyToUse is true.
-	isSecondaryMantleBackupReadyToUse bool
-	diffFrom                          *mantlev1.MantleBackup // non-nil value iff isIncremental is true.
+	isIncremental                           bool // NOTE: The value is forcibly set to false if isSecondaryMantleBackupSnapshotCaptured is true.
+	isSecondaryMantleBackupSnapshotCaptured bool
+	diffFrom                                *mantlev1.MantleBackup // non-nil value iff isIncremental is true.
 }
 
 func (r *MantleBackupReconciler) prepareForDataSynchronization(
@@ -931,23 +931,23 @@ func (r *MantleBackupReconciler) prepareForDataSynchronization(
 		return nil, fmt.Errorf("secondary MantleBackup not found: %s, %s",
 			backup.GetName(), backup.GetNamespace())
 	}
-	isSecondaryMantleBackupReadyToUse := secondaryBackup.IsReady()
+	isSecondaryMantleBackupSnapshotCaptured := secondaryBackup.IsSnapshotCaptured()
 
-	if isSecondaryMantleBackupReadyToUse {
+	if isSecondaryMantleBackupSnapshotCaptured {
 		return &dataSyncPrepareResult{
-			isIncremental:                     false,
-			isSecondaryMantleBackupReadyToUse: true,
-			diffFrom:                          nil,
+			isIncremental:                           false,
+			isSecondaryMantleBackupSnapshotCaptured: true,
+			diffFrom:                                nil,
 		}, nil
 	}
 
 	if syncMode, ok := backup.GetAnnotations()[annotSyncMode]; ok {
 		switch syncMode {
 		case syncModeFull:
 			return &dataSyncPrepareResult{
-				isIncremental:                     false,
-				isSecondaryMantleBackupReadyToUse: isSecondaryMantleBackupReadyToUse,
-				diffFrom:                          nil,
+				isIncremental:                           false,
+				isSecondaryMantleBackupSnapshotCaptured: isSecondaryMantleBackupSnapshotCaptured,
+				diffFrom:                                nil,
 			}, nil
 		case syncModeIncremental:
 			diffFromName, ok := backup.GetAnnotations()[annotDiffFrom]
@@ -965,9 +965,9 @@ func (r *MantleBackupReconciler) prepareForDataSynchronization(
 			}
 
 			return &dataSyncPrepareResult{
-				isIncremental:                     true,
-				isSecondaryMantleBackupReadyToUse: isSecondaryMantleBackupReadyToUse,
-				diffFrom:                          &diffFrom,
+				isIncremental:                           true,
+				isSecondaryMantleBackupSnapshotCaptured: isSecondaryMantleBackupSnapshotCaptured,
+				diffFrom:                                &diffFrom,
 			}, nil
 		default:
 			return nil, fmt.Errorf("unknown sync mode: %s", syncMode)
@@ -988,9 +988,9 @@ func (r *MantleBackupReconciler) prepareForDataSynchronization(
 	isIncremental := (diffFrom != nil)
 
 	return &dataSyncPrepareResult{
-		isIncremental:                     isIncremental,
-		isSecondaryMantleBackupReadyToUse: isSecondaryMantleBackupReadyToUse,
-		diffFrom:                          diffFrom,
+		isIncremental:                           isIncremental,
+		isSecondaryMantleBackupSnapshotCaptured: isSecondaryMantleBackupSnapshotCaptured,
+		diffFrom:                                diffFrom,
 	}, nil
 }
 
@@ -1013,7 +1013,7 @@ func searchForDiffOriginMantleBackup(
 		if !ok {
 			continue
 		}
-		if !primaryBackup.IsReady() || !secondaryBackup.IsReady() {
+		if !primaryBackup.IsSnapshotCaptured() || !secondaryBackup.IsSnapshotCaptured() {
 			continue
 		}
 		if !primaryBackup.DeletionTimestamp.IsZero() || !secondaryBackup.DeletionTimestamp.IsZero() {
@@ -2382,13 +2382,13 @@ func (r *MantleBackupReconciler) reconcileImportJob(
 			return ctrl.Result{}, fmt.Errorf("failed to find imported RBD snapshot: %w", err)
 		}
 
-		// Update the status of the MantleBackup to set True to the ReadyToUse condition.
+		// Update the status of the MantleBackup to set True to the SnapshotCaptured condition.
 		if err := updateStatus(ctx, r.Client, backup, func() error {
 			backup.Status.SnapID = &snapshot.Id
 			meta.SetStatusCondition(&backup.Status.Conditions, metav1.Condition{
-				Type:   mantlev1.BackupConditionReadyToUse,
+				Type:   mantlev1.BackupConditionSnapshotCaptured,
 				Status: metav1.ConditionTrue,
-				Reason: mantlev1.ConditionReasonReadyToUseNoProblem,
+				Reason: mantlev1.ConditionReasonSnapshotCapturedNoProblem,
 			})
 			return nil
 		}); err != nil {