Change completed to true when backup job failed. Fixes #350

bitpoke · Jun 25, 2019 · 24e7b81 · 24e7b81
1 parent 04c440a
commit 24e7b81
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/config/crds/mysql_v1alpha1_mysqlbackup.yaml b/config/crds/mysql_v1alpha1_mysqlbackup.yaml
@@ -51,7 +51,8 @@ spec:
         status:
           properties:
             completed:
-              description: Complete marks the backup in final state
+              description: Completed indicates whether the backup is in a final state,
+                no matter whether its' corresponding job failed or succeeded
               type: boolean
             conditions:
               description: Conditions represents the backup resource conditions list.

diff --git a/pkg/apis/mysql/v1alpha1/mysqlbackup_types.go b/pkg/apis/mysql/v1alpha1/mysqlbackup_types.go
@@ -85,7 +85,8 @@ const (
 
 // MysqlBackupStatus defines the observed state of MysqlBackup
 type MysqlBackupStatus struct {
-	// Complete marks the backup in final state
+	// Completed indicates whether the backup is in a final state,
+	// no matter whether its' corresponding job failed or succeeded
 	Completed bool `json:"completed,omitempty"`
 	// Conditions represents the backup resource conditions list.
 	Conditions []BackupCondition `json:"conditions,omitempty"`

diff --git a/pkg/controller/mysqlbackup/internal/syncer/job.go b/pkg/controller/mysqlbackup/internal/syncer/job.go
@@ -188,6 +188,10 @@ func (s *jobSyncer) updateStatus(job *batch.Job) {
 	// check for failed condition
 	if cond := jobCondition(batch.JobFailed, job); cond != nil {
 		s.backup.UpdateStatusCondition(api.BackupFailed, cond.Status, cond.Reason, cond.Message)
+
+		if cond.Status == core.ConditionTrue {
+			s.backup.Status.Completed = true
+		}
 	}
 }