*: fix the bug status always empty till backup complete radondb#687

acekingke · Sep 8, 2022 · daa8ce7 · daa8ce7
1 parent e1a8c81
commit daa8ce7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/api/v1alpha1/backup_types.go b/api/v1alpha1/backup_types.go
@@ -56,7 +56,8 @@ type BackupStatus struct {
 
 	// Completed indicates whether the backup is in a final state,
 	// no matter whether its' corresponding job failed or succeeded
-	Completed bool `json:"completed,omitempty"`
+	// +kubebuilder:default:=false
+	Completed bool `json:"completed"`
 	// Get the backup path.
 	BackupName string `json:"backupName,omitempty"`
 	// Get the backup Date
@@ -104,6 +105,7 @@ const (
 	BackupComplete BackupConditionType = "Complete"
 	// BackupFailed means backup has failed
 	BackupFailed BackupConditionType = "Failed"
+	BackupStart  BackupConditionType = "Started"
 )
 
 //+kubebuilder:object:root=true

diff --git a/backup/syncer/job.go b/backup/syncer/job.go
@@ -85,6 +85,8 @@ func (s *jobSyncer) SyncFn() error {
 
 func (s *jobSyncer) updateStatus(job *batchv1.Job) {
 	// check for completion condition
+	s.backup.Status.Completed = false
+	s.backup.UpdateStatusCondition(v1alpha1.BackupStart, corev1.ConditionTrue, "backup has started", "backup has started")
 	if cond := jobCondition(batchv1.JobComplete, job); cond != nil {
 		s.backup.UpdateStatusCondition(v1alpha1.BackupComplete, cond.Status, cond.Reason, cond.Message)
 		if cond.Status == corev1.ConditionTrue {

diff --git a/charts/mysql-operator/crds/mysql.radondb.com_backups.yaml b/charts/mysql-operator/crds/mysql.radondb.com_backups.yaml
@@ -89,6 +89,7 @@ spec:
                 description: Get the backup Type
                 type: string
               completed:
+                default: false
                 description: Completed indicates whether the backup is in a final
                   state, no matter whether its' corresponding job failed or succeeded
                 type: boolean
@@ -124,6 +125,8 @@ spec:
                   - type
                   type: object
                 type: array
+            required:
+            - completed
             type: object
         type: object
     served: true

diff --git a/config/crd/bases/mysql.radondb.com_backups.yaml b/config/crd/bases/mysql.radondb.com_backups.yaml
@@ -89,6 +89,7 @@ spec:
                 description: Get the backup Type
                 type: string
               completed:
+                default: false
                 description: Completed indicates whether the backup is in a final
                   state, no matter whether its' corresponding job failed or succeeded
                 type: boolean
@@ -124,6 +125,8 @@ spec:
                   - type
                   type: object
                 type: array
+            required:
+            - completed
             type: object
         type: object
     served: true

diff --git a/controllers/backup_controller.go b/controllers/backup_controller.go
@@ -169,11 +169,8 @@ func (r *BackupReconciler) SetupWithManager(mgr ctrl.Manager) error {
 // Update backup Object and Status.
 func (r *BackupReconciler) updateBackup(savedBackup *apiv1alpha1.Backup, backup *backup.Backup) error {
 	log := log.Log.WithName("controllers").WithName("Backup")
-	if !reflect.DeepEqual(savedBackup, backup.Unwrap()) {
-		if err := r.Update(context.TODO(), backup.Unwrap()); err != nil {
-			return err
-		}
-	}
+	// When update the backup, backup.Status will lost, and I don't know why,
+	// Since it updated to go 1.17, it has got this problem. So I put the update status first.
 	if !reflect.DeepEqual(savedBackup.Status, backup.Unwrap().Status) {
 		log.Info("update backup object status")
 		if err := r.Status().Update(context.TODO(), backup.Unwrap()); err != nil {
@@ -182,6 +179,12 @@ func (r *BackupReconciler) updateBackup(savedBackup *apiv1alpha1.Backup, backup
 			return err
 		}
 	}
+	if !reflect.DeepEqual(savedBackup, backup.Unwrap()) {
+		if err := r.Update(context.TODO(), backup.Unwrap()); err != nil {
+			return err
+		}
+	}
+
 	return nil
 }