[ISSUE #65]Add RocketMQ-on-DLeger group mode deploy

README.md

@@ -187,6 +187,8 @@ spec:
   size: 1
   # nameServers is the [ip:port] list of name service
   nameServers: ""
+  # Whether enable rocketmq-on-dleger group deploy
+  enableDLeger: false
   # replicaPerGroup is the number of each broker cluster
   replicaPerGroup: 1
   # brokerImage is the customized docker image repo of the RocketMQ broker

docs/cn/README.md

@@ -202,6 +202,8 @@ spec:
   nameServers: 192.168.130.33:9876
   # replicationMode is the broker replica sync mode, can be ASYNC or SYNC
   replicationMode: ASYNC
+  # Whether enable rocketmq-on-dleger group deploy
+  enableDLeger: false
   # replicaPerGroup is the number of replica broker in each group
   replicaPerGroup: 1
   # brokerImage is the customized docker image repo of the RocketMQ broker

example/rocketmq_v1alpha1_broker_cr.yaml

@@ -38,6 +38,8 @@ spec:
   size: 1
   # nameServers is the [ip:port] list of name service
   nameServers: ""
+  # Whether enable rocketmq-on-dleger group deploy
+  enableDLeger: false
   # replicaPerGroup is the number of each broker cluster
   replicaPerGroup: 1
   # brokerImage is the customized docker image repo of the RocketMQ broker
@@ -67,6 +69,8 @@ spec:
         configMapKeyRef:
           name: broker-config
           key: BROKER_MEM
+    - name: TZ
+      value: Asia/Shanghai
   # volumes defines the broker.conf
   volumes:
     - name: broker-config
@@ -82,7 +86,7 @@ spec:
         annotations:
           volume.beta.kubernetes.io/storage-class: rocketmq-storage
       spec:
-        accessModes: [ "ReadWriteOnce" ]
+        accessModes: ["ReadWriteOnce"]
         resources:
           requests:
             storage: 8Gi

example/rocketmq_v1alpha1_console_cr.yaml

@@ -27,4 +27,9 @@ spec:
             - name: console
               image: apacherocketmq/rocketmq-console:2.0.0
               ports:
-                - containerPort: 8080
+                - containerPort: 8080
+              env:
+                - name: TZ
+                  value: Asia/Shanghai
+                - name: JAVA_OPTS
+                  value: -Drocketmq.namesrv.addr=rocketmq-name-service:9876 -Dcom.rocketmq.sendMessageWithVIPChannel=false

example/rocketmq_v1alpha1_nameservice_cr.yaml

@@ -33,6 +33,19 @@ spec:
   #  To have DNS options set along with hostNetwork, you have to specify DNS policy
   #  explicitly to 'ClusterFirstWithHostNet'.
   dnsPolicy: ClusterFirstWithHostNet
+  env:
+    - name: TZ
+      value: Asia/Shanghai
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+          - matchExpressions:
+              - key: nameserver
+                operator: In
+                values:
+                  - true
+  tolerations: []
   # resources describes the compute resource requirements and limits
   resources:
     requests:
@@ -52,7 +65,7 @@ spec:
         annotations:
           volume.beta.kubernetes.io/storage-class: rocketmq-storage
       spec:
-        accessModes: [ "ReadWriteOnce" ]
+        accessModes: ["ReadWriteOnce"]
         resources:
           requests:
             storage: 1Gi

example/rocketmq_v1alpha1_rocketmq_cluster.yaml

@@ -41,12 +41,24 @@ spec:
   size: 1
   # nameServers is the [ip:port] list of name service
   nameServers: ""
+  # Whether enable rocketmq-on-dleger group deploy
+  enableDLeger: false
   # replicaPerGroup is the number of each broker cluster
   replicaPerGroup: 1
   # brokerImage is the customized docker image repo of the RocketMQ broker
   brokerImage: apacherocketmq/rocketmq-broker:4.5.0-alpine-operator-0.3.0
   # imagePullPolicy is the image pull policy
   imagePullPolicy: Always
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+          - matchExpressions:
+              - key: broker
+                operator: In
+                values:
+                  - "true"
+  tolerations: []
   # resources describes the compute resource requirements and limits
   resources:
     requests:
@@ -70,6 +82,8 @@ spec:
         configMapKeyRef:
           name: broker-config
           key: BROKER_MEM
+    - name: TZ
+      value: Asia/Shanghai
   # volumes defines the broker.conf
   volumes:
     - name: broker-config
@@ -111,6 +125,19 @@ spec:
   #  To have DNS options set along with hostNetwork, you have to specify DNS policy
   #  explicitly to 'ClusterFirstWithHostNet'.
   dnsPolicy: ClusterFirstWithHostNet
+  env:
+    - name: TZ
+      value: Asia/Shanghai
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+          - matchExpressions:
+              - key: nameserver
+                operator: In
+                values:
+                  - true
+  tolerations: []
   # resources describes the compute resource requirements and limits
   resources:
     requests:
@@ -165,4 +192,9 @@ spec:
             - name: console
               image: apacherocketmq/rocketmq-console:2.0.0
               ports:
-                - containerPort: 8080
+                - containerPort: 8080
+              env:
+                - name: TZ
+                  value: Asia/Shanghai
+                - name: JAVA_OPTS
+                  value: -Drocketmq.namesrv.addr=rocketmq-name-service:9876 -Dcom.rocketmq.sendMessageWithVIPChannel=false

images/broker/alpine/brokerGenConfig.sh

@@ -30,6 +30,17 @@ function create_config() {
     if [ $BROKER_ID != 0 ]; then
         sed -i 's/brokerRole=.*/brokerRole=SLAVE/g' $BROKER_CONFIG_FILE
     fi
+
+    # Enable RocketMQ-on-DLedger Group
+    if [ ! -z $ENABLE_DLEGER ]; then
+        echo "enableDLegerCommitLog=true" >> $BROKER_CONFIG_FILE
+        echo "dLegerGroup=$BROKER_NAME" >> $BROKER_CONFIG_FILE
+        echo "dLegerPeers=$DLEGER_PEERS" >> $BROKER_CONFIG_FILE
+        echo "dLegerSelfId=$DLEGER_SELF_ID" >> $BROKER_CONFIG_FILE
+        if [ ! -z $DLEGER_THREAD_NUM ]; then
+            echo "sendMessageThreadPoolNums=$DLEGER_THREAD_NUM" >> $BROKER_CONFIG_FILE
+        fi
+    fi
 }
 
 create_config

pkg/apis/rocketmq/v1alpha1/broker_types.go

@@ -34,14 +34,18 @@ type BrokerSpec struct {
 	Size int `json:"size"`
 	// NameServers defines the name service list e.g. 192.168.1.1:9876;192.168.1.2:9876
 	NameServers string `json:"nameServers,omitempty"`
+	// Whether enable rocketmq-on-dleger group deploy, false in default
+	EnableDLeger bool `json:"enableDLeger"`
 	// ReplicaPerGroup each broker cluster's replica number
 	ReplicaPerGroup int `json:"replicaPerGroup"`
 	// BaseImage is the broker image to use for the Pods
 	BrokerImage string `json:"brokerImage"`
 	// ImagePullPolicy defines how the image is pulled
 	ImagePullPolicy corev1.PullPolicy `json:"imagePullPolicy"`
 	// AllowRestart defines whether allow pod restart
-	AllowRestart bool `json:"allowRestart"`
+	AllowRestart bool                `json:"allowRestart"`
+	Affinity     corev1.Affinity     `json:"affinity"`
+	Tolerations  []corev1.Toleration `json:"tolerations"`
 	// Resources describes the compute resource requirements
 	Resources corev1.ResourceRequirements `json:"resources"`
 	// StorageMode can be EmptyDir, HostPath, StorageClass

pkg/apis/rocketmq/v1alpha1/nameservice_types.go

@@ -40,7 +40,10 @@ type NameServiceSpec struct {
 	// HostNetwork can be true or false
 	HostNetwork bool `json:"hostNetwork"`
 	// dnsPolicy defines how a pod's DNS will be configured
-	DNSPolicy corev1.DNSPolicy `json:"dnsPolicy"`
+	DNSPolicy   corev1.DNSPolicy    `json:"dnsPolicy"`
+	Env         []corev1.EnvVar     `json:"env"`
+	Affinity    corev1.Affinity     `json:"affinity"`
+	Tolerations []corev1.Toleration `json:"tolerations"`
 	// Resources describes the compute resource requirements
 	Resources corev1.ResourceRequirements `json:"resources"`
 	// StorageMode can be EmptyDir, HostPath, StorageClass

pkg/constants/constants.go

@@ -64,6 +64,18 @@ const (
 	// EnvBrokerName is the container environment variable name of broker name
 	EnvBrokerName = "BROKER_NAME"
 
+	// EnvBrokerIp is the container environment variable name of broker register ip
+	EnvBrokerIp = "BROKER_IP"
+
+	// EnvEnableDLeger is the container environment variable name of enable dLeger
+	EnvEnableDLeger = "ENABLE_DLEGER"
+
+	// EnvDLegerPeers is the container environment variable name of dLeger peers
+	EnvDLegerPeers = "DLEGER_PEERS"
+
+	// EnvDLegerSelfId is the container environment variable name of dLeger self id
+	EnvDLegerSelfId = "DLEGER_SELF_ID"
+
 	// LogMountPath is the directory of RocketMQ log files
 	LogMountPath = DataPath + "/logs"
 
@@ -94,6 +106,12 @@ const (
 	// BrokerMainContainerPortName is the main port name of broker container
 	BrokerMainContainerPortName = "main"
 
+	// BrokerDlegerContainerPort is the dleger port number of broker container
+	BrokerDlegerContainerPort = 40911
+
+	// BrokerDlegerContainerPortName is the dleger port name of broker container
+	BrokerDlegerContainerPortName = "dleger"
+
 	// BrokerHighAvailabilityContainerPort is the high availability port number of broker container
 	BrokerHighAvailabilityContainerPort = 10912