pgo show backup Command Update

Currently, the 'pgo show backup' functionality requires the
Primary pod to be in a Ready state. This is not technically required
because the relevant command is executed within the 'backrest-repo'
pod. As such, this PR separates out the check for the Primary pod
from the 'show backup' functionality so that the backup information
can be shown regardless of the Primary pod's status.

Issue: [ch9402]
Issue: #1927

Author: tjmoore4

apiserver/backrestservice/backrestimpl.go

@@ -191,9 +191,9 @@ func CreateBackup(request *msgs.CreateBackrestBackupRequest, ns, pgouser string)
 
 		}
 
-		//get pod name from cluster
+		// get pod name from cluster
 		var podname string
-		podname, err = getPrimaryPodName(&cluster, ns)
+		podname, err = getBackrestRepoPodName(&cluster, ns)
 
 		if err != nil {
 			log.Error(err)
@@ -202,6 +202,14 @@ func CreateBackup(request *msgs.CreateBackrestBackupRequest, ns, pgouser string)
 			return resp
 		}
 
+		// check if primary is ready
+		if err := isPrimaryReady(&cluster, ns); err != nil {
+			log.Error(err)
+			resp.Status.Code = msgs.Error
+			resp.Status.Msg = err.Error()
+			return resp
+		}
+
 		jobName := "backrest-" + crv1.PgtaskBackrestBackup + "-" + clusterName
 		log.Debugf("setting jobName to %s", jobName)
 
@@ -253,28 +261,9 @@ func getBackupParams(identifier, clusterName, taskName, action, podName, contain
 	return newInstance
 }
 
-func getDeployName(cluster *crv1.Pgcluster, ns string) (string, error) {
-	var depName string
-
-	selector := config.LABEL_PG_CLUSTER + "=" + cluster.Spec.Name + "," + config.LABEL_SERVICE_NAME + "=" + cluster.Spec.Name
-
-	deps, err := kubeapi.GetDeployments(apiserver.Clientset, selector, ns)
-	if err != nil {
-		return depName, err
-	}
-
-	if len(deps.Items) != 1 {
-		return depName, errors.New("error:  deployment count is wrong for backrest backup " + cluster.Spec.Name)
-	}
-	for _, d := range deps.Items {
-		return d.Name, err
-	}
-
-	return depName, errors.New("unknown error in backrest backup")
-}
-
-func getPrimaryPodName(cluster *crv1.Pgcluster, ns string) (string, error) {
-
+// getBackrestRepoPodName goes through the pod list to identify the
+// pgBackRest repo pod and then returns the pod name.
+func getBackrestRepoPodName(cluster *crv1.Pgcluster, ns string) (string, error) {
 	//look up the backrest-repo pod name
 	selector := "pg-cluster=" + cluster.Spec.Name + ",pgo-backrest-repo=true"
 	repopods, err := kubeapi.GetPods(apiserver.Clientset, selector, ns)
@@ -289,25 +278,6 @@ func getPrimaryPodName(cluster *crv1.Pgcluster, ns string) (string, error) {
 
 	repopodName := repopods.Items[0].Name
 
-	primaryReady := false
-
-	//make sure the primary pod is in the ready state
-	selector = config.LABEL_SERVICE_NAME + "=" + cluster.Spec.Name
-
-	pods, err := kubeapi.GetPods(apiserver.Clientset, selector, ns)
-	if err != nil {
-		return "", err
-	}
-	for _, p := range pods.Items {
-		if isPrimary(&p, cluster.Spec.Name) && isReady(&p) {
-			primaryReady = true
-		}
-	}
-
-	if primaryReady == false {
-		return "", errors.New("primary pod is not in Ready state")
-	}
-
 	return repopodName, err
 }
 
@@ -335,6 +305,32 @@ func isReady(pod *v1.Pod) bool {
 
 }
 
+// isPrimaryReady goes through the pod list to first identify the
+// Primary pod and, once identified, determine if it is in a
+// ready state. If not, it returns an error, otherwise it returns
+// a nil value
+func isPrimaryReady(cluster *crv1.Pgcluster, ns string) error {
+	primaryReady := false
+
+	selector := fmt.Sprintf("%s=%s,%s=%s", config.LABEL_PG_CLUSTER, cluster.Name,
+		config.LABEL_PGHA_ROLE, config.LABEL_PGHA_ROLE_PRIMARY)
+
+	pods, err := apiserver.Clientset.CoreV1().Pods(ns).List(meta_v1.ListOptions{LabelSelector: selector})
+	if err != nil {
+		return err
+	}
+	for _, p := range pods.Items {
+		if isPrimary(&p, cluster.Spec.Name) && isReady(&p) {
+			primaryReady = true
+		}
+	}
+
+	if primaryReady == false {
+		return errors.New("primary pod is not in Ready state")
+	}
+	return nil
+}
+
 // ShowBackrest ...
 func ShowBackrest(name, selector, ns string) msgs.ShowBackrestResponse {
 	var err error
@@ -364,7 +360,7 @@ func ShowBackrest(name, selector, ns string) msgs.ShowBackrestResponse {
 	log.Debugf("clusters found len is %d\n", len(clusterList.Items))
 
 	for _, c := range clusterList.Items {
-		podname, err := getPrimaryPodName(&c, ns)
+		podname, err := getBackrestRepoPodName(&c, ns)
 
 		if err != nil {
 			log.Error(err)