fix bug where backrest backup jobs were showing up in the pgo test pod list which causes an error in the output of pgo test

Jeff McCormick · Jeff McCormick · commit c9779a9d11b9 · 2018-08-20T13:18:07.000-05:00
diff --git a/apiserver/clusterservice/clusterimpl.go b/apiserver/clusterservice/clusterimpl.go
@@ -184,7 +184,8 @@ func GetPods(cluster *crv1.Pgcluster) ([]msgs.ShowClusterPod, error) {
 
 	output := make([]msgs.ShowClusterPod, 0)
 
-	selector := util.LABEL_PGPOOL + "!=true," + util.LABEL_PG_CLUSTER + "=" + cluster.Spec.Name
+	//get pods, but exclude pgpool and backup pods
+	selector := util.LABEL_PGBACKUP + "!=true," + util.LABEL_PGBACKUP + "!=false," + util.LABEL_PGPOOL + "!=true," + util.LABEL_PG_CLUSTER + "=" + cluster.Spec.Name
 
 	pods, err := kubeapi.GetPods(apiserver.Clientset, selector, apiserver.Namespace)
 	if err != nil {
@@ -336,7 +337,10 @@ func TestCluster(name, selector string) msgs.ClusterTestResponse {
 				}
 				item.PsqlString = "psql -p " + c.Spec.Port + " -h " + service.ClusterIP + " -U " + username + " " + database
 				log.Debug(item.PsqlString)
-				if service.Name != c.ObjectMeta.Name && replicaReady == false {
+				log.Debug("jeff service.Name=" + service.Name)
+				log.Debug("jeff c.ObjectMeta.Name=" + c.ObjectMeta.Name)
+				log.Debugf("jeff replicaReady=%t", replicaReady)
+				if (service.Name != c.ObjectMeta.Name) && replicaReady == false {
 					item.Working = false
 				} else {
 					status := query(username, service.ClusterIP, c.Spec.Port, database, password)
@@ -358,7 +362,10 @@ func query(dbUser, dbHost, dbPort, database, dbPassword string) bool {
 	var conn *sql.DB
 	var err error
 
-	conn, err = sql.Open("postgres", "sslmode=disable user="+dbUser+" host="+dbHost+" port="+dbPort+" dbname="+database+" password="+dbPassword)
+	connString := "sslmode=disable user=" + dbUser + " host=" + dbHost + " port=" + dbPort + " dbname=" + database + " password=" + dbPassword
+	log.Debug("connString=" + connString)
+
+	conn, err = sql.Open("postgres", connString)
 	if err != nil {
 		log.Debug(err.Error())
 		return false
diff --git a/conf/postgres-operator/backrest-job.json b/conf/postgres-operator/backrest-job.json
@@ -6,6 +6,7 @@
                 "labels": {
                     "vendor": "crunchydata",
                     "pgo-backrest": "true",
+		    "pgbackup": "true",
                     "pg-cluster": "{{.ClusterName}}"
                 }
     },
@@ -16,6 +17,7 @@
                 "labels": {
                     "vendor": "crunchydata",
                     "pgo-backrest": "true",
+		    "pgbackup": "true",
                     "pg-cluster": "{{.ClusterName}}"
                 }
             },
diff --git a/golang-examples/lag.go b/golang-examples/lag.go
@@ -109,7 +109,7 @@ func main() {
 		fmt.Println(err.Error())
 		os.Exit(2)
 	}
-	if len(deployments.Items) > 1 {
+	if len(deployments.Items) < 1 {
 		fmt.Println("no replica deployments found for " + clusterName)
 		os.Exit(2)
 	}
@@ -123,19 +123,20 @@ func main() {
 
 	for _, dep := range deployments.Items {
 		//get the pods for each deployment
+		fmt.Println("got deployment " + dep.Name)
 		selector = "primary=false,replica-name=" + dep.Name
 		podList, err := kubeapi.GetPods(kubeClient, selector, namespace)
 		if err != nil {
 			fmt.Println(err.Error())
 			os.Exit(2)
 		}
-		if len(podList.Items) > 0 {
-			selectedReplica = podList.Items[0]
+
+		//assume each deployment only has a single pod
+		if len(podList.Items) == 1 {
 		} else {
 			fmt.Println("no replicas found")
 			os.Exit(2)
 		}
-
 		pod := podList.Items[0]
 
 		fmt.Println(pod.Name)
