fix scenario: pgbackrest, restore, autofail turned back on, then trigger an autofail

Author: jmccormick2001

controller/podcontroller.go

@@ -261,19 +261,19 @@ func isPostgresPod(newpod *apiv1.Pod) bool {
 		return false
 	}
 	if newpod.ObjectMeta.Labels[util.LABEL_NAME] == "postgres-operator" {
-		log.Debugf("postgres-operator-pod added [%s]", newpod.Name)
+		log.Debugf("postgres-operator-pod found [%s]", newpod.Name)
 		return false
 	}
 	if newpod.ObjectMeta.Labels[util.LABEL_PGO_BACKREST_REPO] == "true" {
-		log.Debugf("pgo-backrest-repo pod added [%s]", newpod.Name)
+		log.Debugf("pgo-backrest-repo pod found [%s]", newpod.Name)
 		return false
 	}
 	if newpod.ObjectMeta.Labels[util.LABEL_PGPOOL] == "true" {
-		log.Debugf("pgpool pod added [%s]", newpod.Name)
+		log.Debugf("pgpool pod found [%s]", newpod.Name)
 		return false
 	}
 	if newpod.ObjectMeta.Labels[util.LABEL_PGBOUNCER] == "true" {
-		log.Debugf("pgbouncer pod added [%s]", newpod.Name)
+		log.Debugf("pgbouncer pod found [%s]", newpod.Name)
 		return false
 	}
 	return true

operator/cluster/failover_strategy_1.go

@@ -20,10 +20,10 @@ package cluster
 
 import (
 	"errors"
-	log "github.com/sirupsen/logrus"
 	crv1 "github.com/crunchydata/postgres-operator/apis/cr/v1"
 	"github.com/crunchydata/postgres-operator/kubeapi"
 	"github.com/crunchydata/postgres-operator/util"
+	log "github.com/sirupsen/logrus"
 	"k8s.io/api/core/v1"
 	"k8s.io/api/extensions/v1beta1"
 	"k8s.io/client-go/kubernetes"
@@ -149,8 +149,8 @@ func updateFailoverStatus(client *rest.RESTClient, task *crv1.Pgtask, namespace,
 func deletePrimary(clientset *kubernetes.Clientset, namespace, clusterName string) error {
 
 	//the primary will be the one with a pod that has a label
-	//that looks like service-name=clustername
-	selector := util.LABEL_SERVICE_NAME + "=" + clusterName
+	//that looks like service-name=clustername and is not a backrest job
+	selector := util.LABEL_SERVICE_NAME + "=" + clusterName + "," + util.LABEL_BACKREST_RESTORE + "!=true," + util.LABEL_BACKREST_JOB + "!=true"
 	pods, err := kubeapi.GetPods(clientset, selector, namespace)
 	if len(pods.Items) == 0 {
 		log.Errorf("no primary pod found when trying to delete primary %s", selector)