*: add serveroffset

Author: acekingke

api/v1alpha1/mysqlcluster_types.go

@@ -123,6 +123,11 @@ type MysqlClusterSpec struct {
 	// +optional
 	// +kubebuilder:default:=false
 	LeaderAsFollower bool `json:"leaderAsfollower,omitempty"`
+
+	// Specification offset of mysql serverid start at
+	// +optional
+	// +kubebuilder:default:0
+	ServerIDOffset int `json:"serverIDOffset,omitempty"`
 }
 
 // ReadOnly define the ReadOnly pods

api/v1beta1/mysqlcluster_types.go

@@ -154,6 +154,11 @@ type MysqlClusterSpec struct {
 	// +optional
 	// +kubebuilder:default:=false
 	LeaderAsFollower bool `json:"leaderAsfollower,omitempty"`
+
+	// Specification offset of mysql serverid start at
+	// +optional
+	// +kubebuilder:default:0
+	ServerIDOffset int `json:"serverIDOffset,omitempty"`
 }
 
 // ReadOnly define the ReadOnly pods

api/v1beta1/zz_generated.conversion.go

@@ -2264,6 +2264,17 @@ spec:
                 required:
                 - num
                 type: object
+              remoteCluster:
+                description: remote replica source
+                properties:
+                  name:
+                    type: string
+                  namespace:
+                    type: string
+                required:
+                - name
+                - namespace
+                type: object
               replicas:
                 default: 3
                 description: Replicas is the number of pods.
@@ -2283,6 +2294,9 @@ spec:
                 description: RestorePoint is the target date and time to restore data.
                   The format is "2006-01-02 15:04:05"
                 type: string
+              serverIDOffset:
+                description: Specification offset of mysql serverid start at
+                type: integer
               sourceConfig:
                 description: Bootstraping from remote data source
                 properties:
@@ -3521,12 +3535,19 @@ spec:
                   remote:
                     description: Bootstraping from remote data source
                     properties:
+                      remoteCluster:
+                        description: remote replica source
+                        properties:
+                          name:
+                            type: string
+                          namespace:
+                            type: string
+                        required:
+                        - name
+                        - namespace
+                        type: object
                       sourceConfig:
-                        description: "Adapts a secret into a projected volume. \n
-                          The contents of the target Secret's Data field will be presented
-                          in a projected volume as files using the keys in the Data
-                          field as the file names. Note that this is identical to
-                          a secret volume source without the default mode."
+                        description: xtrabackup remote source
                         properties:
                           items:
                             description: If unspecified, each key-value pair in the
@@ -4774,6 +4795,9 @@ spec:
                       to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                     type: object
                 type: object
+              serverIDOffset:
+                description: Specification offset of mysql serverid start at
+                type: integer
               service:
                 description: Specification of the service that exposes the MySQL leader
                   instance.

charts/mysql-operator/templates/mysql.radondb.com_mysqlclusters.yaml

@@ -2276,6 +2276,9 @@ spec:
                 description: RestorePoint is the target date and time to restore data.
                   The format is "2006-01-02 15:04:05"
                 type: string
+              serverIDOffset:
+                description: Specification offset of mysql serverid start at
+                type: integer
               sourceConfig:
                 description: Bootstraping from remote data source
                 properties:
@@ -4774,6 +4777,9 @@ spec:
                       to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                     type: object
                 type: object
+              serverIDOffset:
+                description: Specification offset of mysql serverid start at
+                type: integer
               service:
                 description: Specification of the service that exposes the MySQL leader
                   instance.

config/crd/bases/mysql.radondb.com_mysqlclusters.yaml

@@ -164,6 +164,12 @@ func (c *initSidecar) getEnvVars() []corev1.EnvVar {
 		})
 
 	}
+	if c.Spec.ServerIDOffset > 0 {
+		envs = append(envs, corev1.EnvVar{
+			Name:  "SERVER_ID_OFFSET",
+			Value: strconv.Itoa(int(c.Spec.ServerIDOffset)),
+		})
+	}
 
 	return envs
 }

mysqlcluster/container/init_sidecar.go

@@ -43,7 +43,7 @@ import (
 )
 
 // The max quantity of the statuses.
-const maxStatusesQuantity = 10
+// const maxStatusesQuantity = 10
 
 // The retry time for check node status.
 const checkNodeStatusRetry = 3

mysqlcluster/syncer/status.go

@@ -136,7 +136,7 @@ type Config struct {
 
 	RemoteClusterName      string
 	RemoteClusterNamespace string
-	//TODO: add it in env
+	// add it in env
 	ServerIDStartOffset string
 }
 
@@ -225,6 +225,8 @@ func NewInitConfig() *Config {
 		NeedUpgrade:            needUpgrade,
 		RemoteClusterName:      getEnvValue("REMOTE_CLUSTER_NAME"),
 		RemoteClusterNamespace: getEnvValue("REMOTE_CLUSTER_NAMESPACE"),
+		// SERVER_ID_OFFSET
+		ServerIDStartOffset: getEnvValue("SERVER_ID_OFFSET"),
 	}
 }
 
@@ -308,10 +310,22 @@ func (cfg *Config) XBackupName() (string, string) {
 func (cfg *Config) buildExtraConfig(filePath string) (*ini.File, error) {
 	conf := ini.Empty()
 	sec := conf.Section("mysqld")
-	startIndex := mysqlServerIDOffset
+	// convert cfg.SERVER_ID_OFFSET to int
+	var offset int
+	var err error
+	if offset, err = strconv.Atoi(cfg.ServerIDStartOffset); err != nil {
+		offset = 0
+	}
+	startIndex := func() int {
+		if offset <= 0 {
+			return mysqlServerIDOffset
+		}
+		return offset
+	}()
+
 	ordinal, err := utils.GetOrdinal(cfg.HostName)
 	arr := strings.Split(cfg.HostName, "-")
-	if len(cfg.RemoteClusterName) > 0 {
+	if len(cfg.RemoteClusterName) > 0 && offset <= 0 {
 		log.Info("It has remote cluster server-id start offset  +100")
 		startIndex += mysqlServerIDOffsetInc
 	}