Merge pull request #662 from acekingke/fixCronCanNotRemove

controllers: fix the bug cronjob exits when cluster is gone #661

Author: acekingke

backup/cronbackup.go

@@ -36,7 +36,10 @@ func (j *CronJob) Run() {
 	if j.BackupScheduleJobsHistoryLimit != nil {
 		defer j.backupGC()
 	}
-
+	if !j.backupNeedRun() {
+		log.Info("the cron is deleting when cronjob is starting")
+		return
+	}
 	// check if a backup is running
 	if j.scheduledBackupsRunningCount() > 0 {
 		log.Info("at least a backup is running", "running_backups_count", j.scheduledBackupsRunningCount())
@@ -73,6 +76,18 @@ func (j *CronJob) backupSelector() *client.ListOptions {
 	return selector
 }
 
+func (j *CronJob) backupNeedRun() bool {
+	// When remove the entries, it may has cron task is running.
+	cluster := &apiv1alpha1.MysqlCluster{}
+	if err := j.Client.Get(context.TODO(), client.ObjectKey{
+		Name:      j.ClusterName,
+		Namespace: j.Namespace,
+	}, cluster); err != nil {
+		return false
+	}
+	return *cluster.Spec.Replicas != 0
+}
+
 func (j *CronJob) recurrentBackupLabels() map[string]string {
 	return map[string]string{
 		"recurrent": "true",

controllers/backupcron_controller.go

@@ -78,6 +78,9 @@ func (r *BackupCronReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 			// Object not found, return.  Created objects are automatically garbage collected.
 			// For additional cleanup logic use finalizers.
 			log.Info("instance not found, maybe removed")
+			if err := r.Cron.Remove(instance.Name); err == nil {
+				log.V(1).Info("remove cronjob from cluster", "name", instance.Name)
+			}
 			return ctrl.Result{}, nil
 		}
 		return ctrl.Result{}, err
@@ -87,7 +90,11 @@ func (r *BackupCronReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		return ctrl.Result{}, err
 	}
 	// if spec.backupScheduler is not set then don't do anything
-	if len(instance.Spec.BackupSchedule) == 0 {
+	if len(instance.Spec.BackupSchedule) == 0 || *instance.Spec.Replicas == 0 {
+		if err := r.Cron.Remove(instance.Name); err == nil {
+			log.V(1).Info("remove cronjob from cluster", "name", instance.Name)
+		}
+
 		return reconcile.Result{}, nil
 	}