Use CLUSTER_NAME.NAMESPACE as orchestrator cluster alias

Author: calind

cmd/mysql-helper/util/util.go

@@ -82,18 +82,22 @@ func GetHostname() string {
 }
 
 func GetClusterName() string {
-	hn := GetHostname()
-	l := strings.Split(hn, "-")
+	return getEnvValue("MY_CLUSTER_NAME")
+}
 
-	return strings.Join(l[:len(l)-2], "-")
+func GetNamespace() string {
+	return getEnvValue("MY_NAMESPACE")
+}
+
+func GetServiceName() string {
+	return getEnvValue("MY_SERVICE_NAME")
 }
 
 func NodeRole() string {
 	if GetMasterHost() == GetHostFor(GetServerId()) {
 		return "master"
 	}
 	return "slave"
-
 }
 
 func getOrdinal() int {
@@ -117,9 +121,10 @@ func GetServerId() int {
 
 // GetHostFor returns the host for given server id
 func GetHostFor(id int) string {
-	base := fmt.Sprintf("%s-%s", GetClusterName(), NameOfStatefulSet)
-	govSVC := getEnvValue("TITANIUM_HEADLESS_SERVICE")
-	return fmt.Sprintf("%s-%d.%s", base, id-100, govSVC)
+	base := api.GetNameForResource(NameOfStatefulSet, GetClusterName())
+	govSVC := GetServiceName()
+	namespace := GetNamespace()
+	return fmt.Sprintf("%s-%d.%s.%s", base, id-100, govSVC, namespace)
 }
 
 func getEnvValue(key string) string {
@@ -169,8 +174,10 @@ func GetMasterHost() string {
 		return GetHostFor(100)
 	}
 
+	fqClusterName := fmt.Sprintf("%s.%s", GetClusterName(), GetNamespace())
+
 	client := orc.NewFromUri(orcUri)
-	inst, err := client.Master(GetClusterName())
+	inst, err := client.Master(fqClusterName)
 	if err != nil {
 		glog.Errorf("Failed to connect to orc for finding master, err: %s."+
 			" Fallback to determine master by its id.", err)

hack/charts/mysql-operator/values.yaml

@@ -37,7 +37,7 @@ orchestrator:
     HostnameResolveMethod: "none"
     MySQLHostnameResolveMethod: "@@report_host"
     RemoveTextFromHostnameDisplay: ":3306"
-    DetectClusterAliasQuery: "SELECT SUBSTRING(@@hostname, 1, LENGTH(@@hostname) - 1 - LENGTH(SUBSTRING_INDEX(@@hostname,'-',-2)))"
+    DetectClusterAliasQuery: "SELECT CONCAT(SUBSTRING(@@hostname, 1, LENGTH(@@hostname) - 1 - LENGTH(SUBSTRING_INDEX(@@hostname,'-',-2))),'.',SUBSTRING_INDEX(@@report_host,'.',-1))"
     DetectInstanceAliasQuery: "SELECT @@hostname"
 
     # Automated recovery (this is opt-in, so we need to set these)

pkg/apis/mysql/v1alpha1/cluster.go

@@ -232,10 +232,10 @@ const (
 )
 
 func (c *MysqlCluster) GetNameForResource(name ResourceName) string {
-	return getNameForResource(name, c.Name)
+	return GetNameForResource(name, c.Name)
 }
 
-func getNameForResource(name ResourceName, clusterName string) string {
+func GetNameForResource(name ResourceName, clusterName string) string {
 	return fmt.Sprintf("%s-mysql", clusterName)
 }
 
@@ -273,12 +273,13 @@ func (c *MysqlCluster) GetMasterHost() string {
 	// connect to orc and get the master host of the cluster.
 	if len(c.Spec.GetOrcUri()) != 0 {
 		client := orc.NewFromUri(c.Spec.GetOrcUri())
-		if inst, err := client.Master(c.Name); err == nil {
+		orcClusterName := fmt.Sprintf("%s.%s", c.Name, c.Namespace)
+		if inst, err := client.Master(orcClusterName); err == nil {
 			masterHost = inst.Key.Hostname
 		} else {
-			glog.Warning(
-				"[GetMasterHost]: Failed to connect to orcheatratoro: %s, failback to default",
-				err,
+			glog.Warningf(
+				"Failed getting master for %s: %s, falling back to default.",
+				orcClusterName, err,
 			)
 		}
 	}

pkg/mysqlcluster/cluster.go

@@ -68,7 +68,7 @@ const (
 	statusUpToDate = "up-to-date"
 	statusCreated  = "created"
 	statusUpdated  = "updated"
-	statusFailed    = "faild"
+	statusFailed   = "faild"
 	statusOk       = "ok"
 	statusSkip     = "skip"
 )
@@ -154,7 +154,7 @@ func (f *cFactory) Sync(ctx context.Context) error {
 		for i := 0; i < int(f.cluster.Status.ReadyNodes); i++ {
 			host := f.getHostForReplica(i)
 			if err := client.Discover(host, MysqlPort); err != nil {
-				glog.Infof("Failed to register into orchestrator host: %s", host)
+				glog.Infof("Failed to register %s with orchestrator: %s", host, err.Error())
 			}
 		}
 	}
@@ -174,6 +174,7 @@ func (f *cFactory) getOwnerReferences(ors ...[]metav1.OwnerReference) []metav1.O
 }
 
 func (f *cFactory) getHostForReplica(no int) string {
-	return fmt.Sprintf("%s-%d.%s", f.cluster.GetNameForResource(api.StatefulSet), no,
-		f.cluster.GetNameForResource(api.HeadlessSVC))
+	return fmt.Sprintf("%s-%d.%s.%s", f.cluster.GetNameForResource(api.StatefulSet), no,
+		f.cluster.GetNameForResource(api.HeadlessSVC),
+		f.cluster.Namespace)
 }

pkg/mysqlcluster/statefullset.go

@@ -122,11 +122,52 @@ func (f *cFactory) ensureContainer(in core.Container, name, image string, args [
 	in.ImagePullPolicy = f.cluster.Spec.PodSpec.ImagePullPolicy
 	in.Args = args
 	in.EnvFrom = f.getEnvSourcesFor(name)
+	in.Env = f.getDefaultEnv()
 	in.VolumeMounts = f.getVolumeMountsFor(name)
 
 	return in
 }
 
+func (f *cFactory) getDefaultEnv() (env []core.EnvVar) {
+	env = append(env, core.EnvVar{
+		Name: "MY_NAMESPACE",
+		ValueFrom: &core.EnvVarSource{
+			FieldRef: &core.ObjectFieldSelector{
+				FieldPath: "metadata.namespace",
+			},
+		},
+	})
+	env = append(env, core.EnvVar{
+		Name: "MY_POD_NAME",
+		ValueFrom: &core.EnvVarSource{
+			FieldRef: &core.ObjectFieldSelector{
+				FieldPath: "metadata.name",
+			},
+		},
+	})
+	env = append(env, core.EnvVar{
+		Name: "MY_POD_IP",
+		ValueFrom: &core.EnvVarSource{
+			FieldRef: &core.ObjectFieldSelector{
+				FieldPath: "status.podIP",
+			},
+		},
+	})
+	env = append(env, core.EnvVar{
+		Name:  "MY_SERVICE_NAME",
+		Value: f.cluster.GetNameForResource(api.HeadlessSVC),
+	})
+	env = append(env, core.EnvVar{
+		Name:  "MY_CLUSTER_NAME",
+		Value: f.cluster.Name,
+	})
+	env = append(env, core.EnvVar{
+		Name:  "MY_FQDN",
+		Value: "$(MY_POD_NAME).$(MY_SERVICE_NAME).$(MY_NAMESPACE)",
+	})
+	return
+}
+
 func (f *cFactory) ensureInitContainersSpec(in []core.Container) []core.Container {
 	if len(in) == 0 {
 		in = make([]core.Container, 2)

pkg/util/constants/constants.go

@@ -27,6 +27,6 @@ const (
 	DefaultBackupPodHTTPPort = 19999
 
 	EnvOperatorPodName            = "MY_POD_NAME"
-	EnvOperatorPodNamespace       = "MY_POD_NAMESPACE"
+	EnvOperatorPodNamespace       = "MY_NAMESPACE"
 	EnvRestoreOperatorServiceName = "SERVICE_ADDR"
 )