Remove backup service account logic. Register cluster to cron.

Author: AMecea

cmd/mysql-helper/appschedulebackup/appschedulebackup.go

@@ -29,7 +29,6 @@ import (
 	"github.com/presslabs/mysql-operator/cmd/mysql-helper/appclone"
 	"github.com/presslabs/mysql-operator/cmd/mysql-helper/appconf"
 	"github.com/presslabs/mysql-operator/cmd/mysql-helper/apphelper"
-	"github.com/presslabs/mysql-operator/cmd/mysql-helper/appschedulebackup"
 	"github.com/presslabs/mysql-operator/cmd/mysql-helper/apptakebackup"
 	"github.com/presslabs/mysql-operator/pkg/util/logs"
 )
@@ -103,27 +102,6 @@ func main() {
 	}
 	cmd.AddCommand(takeBackupCmd)
 
-	var backupNamespace string
-	scheduleBackupCmd := &cobra.Command{
-		Use:   "schedule-backup",
-		Short: "Schedule a backup for cluster",
-		Args: func(cmd *cobra.Command, args []string) error {
-			if len(args) != 1 {
-				return fmt.Errorf("require cluster name")
-			}
-			return nil
-		},
-		Run: func(cmd *cobra.Command, args []string) {
-			err := appschedulebackup.RunCommand(stopCh, backupNamespace, args[0])
-			if err != nil {
-				glog.Fatalf("Schduler command failed with error: %s .", err)
-			}
-		},
-	}
-	scheduleBackupCmd.Flags().StringVar(&backupNamespace, "namespace", "default",
-		"Specify the namespace where to create backups.")
-	cmd.AddCommand(scheduleBackupCmd)
-
 	cmd.PersistentFlags().AddGoFlagSet(flag.CommandLine)
 	flag.CommandLine.Parse([]string{})
 	if err := cmd.Execute(); err != nil {

cmd/mysql-helper/main.go

@@ -6,8 +6,8 @@ keywords:
   - percona
   - orchestrator
   - presslabs
-version: 0.1.9
+version: 0.1.10
 home: https://github.com/presslabs/mysql-operator
 sources:
   - https://github.com/presslabs/mysql-operator.git
-appVersion: 0.1.9
+appVersion: 0.1.10

hack/charts/mysql-operator/Chart.yaml

@@ -47,9 +47,6 @@ spec:
             {{- if .Values.installCRDs }}
             - --install-crds
             {{- end }}
-            {{- if .Values.rbac.create }}
-            - --backup-service-account-name={{ template "mysql-operator.serviceAccountName" . }}-backups
-            {{- end }}
           resources:
             {{ toYaml .Values.resources | nindent 12 }}
           livenessProbe:

hack/charts/mysql-operator/templates/deployment.yaml

@@ -56,38 +56,4 @@ subjects:
   - name: {{ template "mysql-operator.serviceAccountName" . }}
     namespace: {{ .Release.Namespace | quote }}
     kind: ServiceAccount
-
----
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: ClusterRole
-metadata:
-  name: {{ template "mysql-operator.fullname" . }}-backups
-  labels:
-    app: {{ template "mysql-operator.name" . }}
-    chart: {{ template "mysql-operator.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-rules:
-  - apiGroups: ["mysql.presslabs.org"]
-    resources: ["mysqlbackups"]
-    verbs: ["*"]
----
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ template "mysql-operator.fullname" . }}-backups
-  labels:
-    app: {{ template "mysql-operator.name" . }}
-    chart: {{ template "mysql-operator.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: {{ template "mysql-operator.fullname" . }}-backups
-subjects:
-  - name: {{ template "mysql-operator.serviceAccountName" . }}-backups
-    namespace: {{ .Release.Namespace | quote }}
-    kind: ServiceAccount
-
 {{- end -}}

hack/charts/mysql-operator/templates/rbac.yaml

@@ -8,16 +8,4 @@ metadata:
     chart: {{ template "mysql-operator.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ template "mysql-operator.serviceAccountName" . }}-backups
-  labels:
-    app: {{ template "mysql-operator.name" . }}
-    chart: {{ template "mysql-operator.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-
 {{- end }}

hack/charts/mysql-operator/templates/serviceaccount.yaml

@@ -151,8 +151,6 @@ const (
 	EventReasonServiceUpdated             = "HLServiceUpdated"
 	EventReasonSFSFailed                  = "StatefulSetFailed"
 	EventReasonSFSUpdated                 = "StatefulSetUpdated"
-	EventReasonCronJobFailed              = "CronJobFailed"
-	EventReasonCronJobUpdated             = "CronJobUpdated"
 	EventReasonMasterServiceFailed        = "MasterServiceFailed"
 	EventReasonMasterServiceUpdated       = "MasterServiceUpdated"
 	EventReasonHealthyNodesServiceFailed  = "HealthyNodesServiceFailed"

pkg/apis/mysql/v1alpha1/status.go

@@ -18,11 +18,12 @@ package clustercontroller
 
 import (
 	"fmt"
+	"reflect"
 	"sync"
 	"time"
 
 	"github.com/golang/glog"
-	//"github.com/robfig/cron"
+	"github.com/wgliang/cron"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 
@@ -57,28 +58,42 @@ func (c *Controller) registerClusterInBackupCron(cluster *api.MysqlCluster) erro
 		return nil
 	}
 
+	schedule, err := cron.Parse(cluster.Spec.BackupSchedule)
+	if err != nil {
+		return fmt.Errorf("fail to parse schedule: %s", err)
+	}
+
 	lockJobRegister.Lock()
 	defer lockJobRegister.Unlock()
 
 	for _, entry := range c.cron.Entries() {
 		j, ok := entry.Job.(job)
 		if ok && j.Name == cluster.Name && j.Namespace == cluster.Namespace {
 			glog.V(3).Infof("Cluster %s already added to cron.", cluster.Name)
+			if !reflect.DeepEqual(entry.Schedule, schedule) {
+				glog.Infof("Update cluster '%s' scheduler to: %s",
+					cluster.Name, cluster.Spec.BackupSchedule)
+				c.cron.Remove(cluster.Name)
+				break
+			}
 			return nil
 		}
 	}
 
-	return c.cron.AddJob(cluster.Spec.BackupSchedule, job{
+	c.cron.Schedule(schedule, job{
 		Name:          cluster.Name,
 		Namespace:     cluster.Namespace,
 		myClient:      c.myClient,
 		BackupRunning: new(bool),
 		lock:          new(sync.Mutex),
-	})
+	}, cluster.Name)
+
+	return nil
 }
 
 func (j job) Run() {
 	backupName := fmt.Sprintf("%s-auto-backup-%s", j.Name, time.Now().Format("2006-01-02t15-04-05"))
+	glog.Infof("Schedul backup job started. Creating backup %s..", backupName)
 
 	// Wrap backup creation to ensure that lock is released when backup is
 	// created

pkg/controller/clustercontroller/backups.go

@@ -26,7 +26,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gstruct"
-	"github.com/robfig/cron"
+	"github.com/wgliang/cron"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	api "github.com/presslabs/mysql-operator/pkg/apis/mysql/v1alpha1"
@@ -114,12 +114,14 @@ var _ = Describe("Test cluster reconciliation queue", func() {
 					BackupRunning: new(bool),
 					lock:          new(sync.Mutex),
 				}
-				go j.Run()
+
 				go j.Run()
 
-				Eventually(func() *bool {
-					return j.BackupRunning
-				}).Should(PointTo(Equal(true)))
+				Eventually(func() bool {
+					j.lock.Lock() // avoid a data race
+					defer j.lock.Unlock()
+					return *j.BackupRunning
+				}).Should(Equal(true))
 				Eventually(func() []api.MysqlBackup {
 					bs, _ := myClient.Mysql().MysqlBackups(j.Namespace).List(metav1.ListOptions{})
 					return bs.Items
@@ -131,9 +133,11 @@ var _ = Describe("Test cluster reconciliation queue", func() {
 				_, err := myClient.Mysql().MysqlBackups(j.Namespace).Update(&backup)
 				Expect(err).To(Succeed())
 
-				Eventually(func() *bool {
-					return j.BackupRunning
-				}).Should(PointTo(Equal(false)))
+				Eventually(func() bool {
+					j.lock.Lock() // avoid a data race
+					defer j.lock.Unlock()
+					return *j.BackupRunning
+				}).Should(Equal(false))
 			})
 		})
 	})

pkg/controller/clustercontroller/backups_test.go

@@ -23,7 +23,7 @@ import (
 	"time"
 
 	"github.com/golang/glog"
-	"github.com/robfig/cron"
+	"github.com/wgliang/cron"
 	apiext_clientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	k8errors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/util/runtime"
@@ -151,6 +151,9 @@ func (c *Controller) Start(workers int, stopCh <-chan struct{}) error {
 		return fmt.Errorf("error waiting for informer cache to sync")
 	}
 
+	// start cron
+	c.cron.Start()
+
 	for i := 0; i < workers; i++ {
 		c.workerWg.Add(1)
 		go wait.Until(func() { c.workerController(stopCh) }, workerPeriodTime, stopCh)
@@ -165,6 +168,7 @@ func (c *Controller) Start(workers int, stopCh <-chan struct{}) error {
 	glog.V(2).Info("Shutting down controller.")
 	c.queue.ShutDown()
 	c.reconcileQueue.ShutDown()
+	c.cron.Stop()
 	glog.V(2).Info("Wait for workers to exit...")
 	c.workerWg.Wait()
 	glog.V(2).Info("Workers exited.")