Fix issues with pod labeling

Author: smanpathak

pkg/mysqlcluster/cluster.go

@@ -170,6 +170,9 @@ func (f *cFactory) Sync(ctx context.Context) error {
 		return fmt.Errorf("cluster sync ready endpoints: %s", err)
 	}
 
+	if err := f.updatePodLabels(); err != nil {
+		return fmt.Errorf("cluster sync pod labeling: %s", err)
+	}
 	return nil
 }
 

pkg/mysqlcluster/endpoints.go

@@ -30,9 +30,6 @@ const (
 
 func (f *cFactory) updateMasterServiceEndpoints() error {
 	masterHost := f.getMasterHost()
-	if err := f.updatePodLabels(masterHost); err != nil {
-		return err
-	}
 
 	return f.addNodesToService(f.cluster.GetNameForResource(api.MasterService), masterHost)
 }

pkg/mysqlcluster/pods.go

@@ -26,12 +26,14 @@ import (
 )
 
 // Set K8S labels indicating role pods: Master or Replica
-func (f *cFactory) updatePodLabels(masterHost string) error {
+func (f *cFactory) updatePodLabels() error {
+	masterHost := f.getMasterHost()
+
 	for _, ns := range f.cluster.Status.Nodes {
 		pod, err := getPodForHostname(f.client, f.namespace, f.getLabels(map[string]string{}), ns.Name)
 		if err != nil {
 			glog.Errorf("Failed to update pod labels: %s", err)
-			continue
+			return err
 		}
 
 		labels := pod.GetLabels()
@@ -43,6 +45,7 @@ func (f *cFactory) updatePodLabels(masterHost string) error {
 			desiredVal = "master"
 		}
 
+		glog.Infof("Inspecting pod: %s, label: %s, desired: %s", pod.Name, val, desiredVal)
 		if !exists || val != desiredVal {
 			labels["role"] = desiredVal
 			glog.Infof("Updating labels for Pod: %s", pod.Name)
@@ -53,11 +56,13 @@ func (f *cFactory) updatePodLabels(masterHost string) error {
 				OwnerReferences: pod.GetOwnerReferences(),
 				Namespace:       pod.GetNamespace(),
 			}
-			kcore.CreateOrPatchPod(f.client, meta,
+			_, act, err := kcore.CreateOrPatchPod(f.client, meta,
 				func(in *core.Pod) *core.Pod {
 					in.Labels = labels
 					return in
 				})
+			glog.Infof("Pod %s was %s", pod.Name, getStatusFromKVerb(act))
+			return err
 		}
 	}
 

pkg/mysqlcluster/utils.go

@@ -107,12 +107,12 @@ func (f *cFactory) addNodesToService(serviceName string, hosts ...string) error
 	for _, host := range hosts {
 		pod, err := getPodForHostname(f.client, f.namespace, f.getLabels(map[string]string{}), host)
 		if err != nil {
-			glog.Errorf("Failed to set master service endpoints: %s", err)
+			glog.Errorf("Failed to set %s service endpoints: %s", serviceName, err)
 			continue
 		}
 
 		if len(pod.Status.PodIP) == 0 {
-			glog.Errorf("Failed to set master service endpoints, ip for pod %s not set %s", pod.Name, err)
+			glog.Errorf("Failed to set %s service endpoints, ip for pod %s not set %s", serviceName, pod.Name, err)
 			continue
 		}
 		pods = append(pods, pod)
@@ -162,8 +162,7 @@ func (f *cFactory) addNodesToService(serviceName string, hosts ...string) error
 			return in
 		})
 
-	glog.Infof("Endpoints for service '%s' were %s.",
-		f.cluster.GetNameForResource(api.MasterService), getStatusFromKVerb(act))
+	glog.Infof("Endpoints for service '%s' were %s.", serviceName, getStatusFromKVerb(act))
 
 	return err
 }