Merge pull request #12 from ucloud/backup-onejob

Backup onejob

Author: polefishu

pkg/apis/redis/v1alpha1/default.go

@@ -116,3 +116,7 @@ func (in *RedisClusterBackup) Location() (string, error) {
 func (in *RedisClusterBackup) OSMSecretName() string {
 	return fmt.Sprintf("osm-%v", in.Name)
 }
+
+func (in *RedisClusterBackup) JobName() string {
+	return fmt.Sprintf("redisbacup-%v", in.Name)
+}

pkg/apis/redis/v1alpha1/redisclusterbackup_types.go

@@ -143,6 +143,8 @@ const (
 	BackupPhaseSucceeded BackupPhase = "Succeeded"
 	// used for Backup that are Failed
 	BackupPhaseFailed BackupPhase = "Failed"
+	// used for Backup that are Ignored
+	BackupPhaseIgnored BackupPhase = "Ignored"
 )
 
 // RedisClusterBackupStatus defines the observed state of RedisClusterBackup

pkg/controller/redisclusterbackup/helper.go

@@ -23,12 +23,20 @@ func (r *ReconcileRedisClusterBackup) markAsFailedBackup(backup *redisv1alpha1.R
 	return r.crController.UpdateCRStatus(backup)
 }
 
+func (r *ReconcileRedisClusterBackup) markAsIgnoredBackup(backup *redisv1alpha1.RedisClusterBackup,
+	reason string) error {
+	t := metav1.Now()
+	backup.Status.CompletionTime = &t
+	backup.Status.Phase = redisv1alpha1.BackupPhaseIgnored
+	backup.Status.Reason = reason
+	return r.crController.UpdateCRStatus(backup)
+}
+
 func (r *ReconcileRedisClusterBackup) isBackupRunning(backup *redisv1alpha1.RedisClusterBackup) (bool, error) {
 	labMap := client.MatchingLabels{
 		redisv1alpha1.LabelBackupStatus: string(redisv1alpha1.BackupPhaseRunning),
 		redisv1alpha1.LabelClusterName:  backup.Spec.RedisClusterName,
 	}
-
 	backupList := &redisv1alpha1.RedisClusterBackupList{}
 	opts := []client.ListOption{
 		client.InNamespace(backup.Namespace),
@@ -39,7 +47,16 @@ func (r *ReconcileRedisClusterBackup) isBackupRunning(backup *redisv1alpha1.Redi
 		return false, err
 	}
 
-	if len(backupList.Items) > 0 {
+	jobLabMap := client.MatchingLabels{
+		redisv1alpha1.LabelClusterName:  backup.Spec.RedisClusterName,
+		redisv1alpha1.AnnotationJobType: redisv1alpha1.JobTypeBackup,
+	}
+	backupJobList, err := r.jobController.ListJobByLabels(backup.Namespace, jobLabMap)
+	if err != nil {
+		return false, err
+	}
+
+	if len(backupList.Items) > 0 && len(backupJobList.Items) > 0 {
 		return true, nil
 	}
 

pkg/controller/redisclusterbackup/redisclusterbackup_controller.go

@@ -83,7 +83,7 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
 		},
 		CreateFunc: func(e event.CreateEvent) bool {
 			job := e.Object.(*batch.Job)
-			if job.Status.Succeeded > 0 || job.Status.Failed > utils.Int32(job.Spec.BackoffLimit) {
+			if job.Status.Succeeded > 0 || job.Status.Failed >= utils.Int32(job.Spec.BackoffLimit) {
 				return true
 			}
 			return false
@@ -150,7 +150,7 @@ func (r *ReconcileRedisClusterBackup) Reconcile(request reconcile.Request) (reco
 			// Run finalization logic for backupFinalizer. If the
 			// finalization logic fails, don't remove the finalizer so
 			// that we can retry during the next reconciliation.
-			if err := r.finalizeMemcached(reqLogger, instance); err != nil {
+			if err := r.finalizeBackup(reqLogger, instance); err != nil {
 				return reconcile.Result{}, err
 			}
 
@@ -179,7 +179,7 @@ func (r *ReconcileRedisClusterBackup) Reconcile(request reconcile.Request) (reco
 	return reconcile.Result{}, nil
 }
 
-func (r *ReconcileRedisClusterBackup) finalizeMemcached(reqLogger logr.Logger, b *redisv1alpha1.RedisClusterBackup) error {
+func (r *ReconcileRedisClusterBackup) finalizeBackup(reqLogger logr.Logger, b *redisv1alpha1.RedisClusterBackup) error {
 	// TODO(user): Add the cleanup steps that the operator
 	// needs to do before the CR can be deleted. Examples
 	// of finalizers include performing backups and deleting
@@ -189,7 +189,7 @@ func (r *ReconcileRedisClusterBackup) finalizeMemcached(reqLogger logr.Logger, b
 }
 
 func (r *ReconcileRedisClusterBackup) addFinalizer(reqLogger logr.Logger, b *redisv1alpha1.RedisClusterBackup) error {
-	reqLogger.Info("Adding Finalizer for the Memcached")
+	reqLogger.Info("Adding Finalizer for the backup")
 	b.SetFinalizers(append(b.GetFinalizers(), backupFinalizer))
 
 	// Update CR