fix pgo-backrest env var check, add job delete check in apiserver for backrest backup job creation

Jeff McCormick · Jeff McCormick · commit 6485a20f979a · 2018-09-11T18:08:47.000-05:00
diff --git a/apiserver/backrestservice/backrestimpl.go b/apiserver/backrestservice/backrestimpl.go
@@ -25,7 +25,7 @@ import (
 	"github.com/crunchydata/postgres-operator/util"
 	"k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	//"time"
+	"time"
 )
 
 const backrestCommand = "pgbackrest"
@@ -107,8 +107,24 @@ func CreateBackup(request *msgs.CreateBackrestBackupRequest) msgs.CreateBackrest
 
 			//remove any previous backup job
 
-			kubeapi.DeleteJobs(apiserver.Clientset, util.LABEL_PG_CLUSTER+"="+clusterName+","+util.LABEL_BACKREST+"=true", apiserver.Namespace)
-			//time.Sleep(time.Seconds * 2)
+			selector := util.LABEL_PG_CLUSTER + "=" + clusterName + "," + util.LABEL_BACKREST + "=true"
+			err = kubeapi.DeleteJobs(apiserver.Clientset, selector, apiserver.Namespace)
+			if err != nil {
+				log.Error(err)
+			}
+
+			//a hack sort of due to slow propagation
+			for i := 0; i < 3; i++ {
+				jobList, err := kubeapi.GetJobs(apiserver.Clientset, selector, apiserver.Namespace)
+				if err != nil {
+					log.Error(err)
+				}
+				if len(jobList.Items) > 0 {
+					log.Debug("sleeping a bit for delete job propagation")
+					time.Sleep(time.Second * 2)
+				}
+			}
+
 		}
 
 		//get pod name from cluster
diff --git a/conf/postgres-operator/backrest-job.json b/conf/postgres-operator/backrest-job.json
@@ -2,7 +2,7 @@
     "apiVersion": "batch/v1",
     "kind": "Job",
     "metadata": {
-        "name": "backrest-{{.PodName}}",
+                "name": "backrest-{{.Command}}-{{.ClusterName}}",
                 "labels": {
                     "vendor": "crunchydata",
                     "pgo-backrest": "true",
@@ -13,7 +13,7 @@
     "spec": {
         "template": {
             "metadata": {
-                "name": "backrest-{{.PodName}}",
+                "name": "backrest-{{.Command}}-{{.ClusterName}}",
                 "labels": {
                     "vendor": "crunchydata",
                     "pgo-backrest": "true",
diff --git a/pgo-backrest/pgo-backrest.go b/pgo-backrest/pgo-backrest.go
@@ -51,10 +51,6 @@ func main() {
 
 	COMMAND_OPTS := os.Getenv("COMMAND_OPTS")
 	log.Debug("setting COMMAND_OPTS to " + COMMAND_OPTS)
-	if COMMAND_OPTS == "" {
-		log.Error("COMMAND_OPTS env var not set")
-		os.Exit(2)
-	}
 
 	PODNAME := os.Getenv("PODNAME")
 	log.Debug("setting PODNAME to " + PODNAME)
