add affinity to binlog

pingcap · Aug 8, 2019 · 160dcb0 · 160dcb0
1 parent 46c7b76
commit 160dcb0
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 0 deletions.
diff --git a/charts/tidb-cluster/templates/drainer-statefulset.yaml b/charts/tidb-cluster/templates/drainer-statefulset.yaml
@@ -30,6 +30,10 @@ spec:
         app.kubernetes.io/managed-by: tidb-operator
         app.kubernetes.io/component: drainer
     spec:
+    {{- if .Values.binlog.drainer.affinity }}
+      affinity:
+{{ toYaml .Values.binlog.drainer.affinity | indent 8 }}
+    {{- end }}
       containers:
       - name: drainer
         image: {{ .Values.binlog.drainer.image }}

diff --git a/charts/tidb-cluster/templates/pump-statefulset.yaml b/charts/tidb-cluster/templates/pump-statefulset.yaml
@@ -30,6 +30,10 @@ spec:
         app.kubernetes.io/managed-by: tidb-operator
         app.kubernetes.io/component: pump
     spec:
+    {{- if .Values.binlog.pump.affinity }}
+      affinity:
+{{ toYaml .Values.binlog.pump.affinity | indent 8 }}
+    {{- end }}
       containers:
       - name: pump
         image: {{ .Values.binlog.pump.image }}

diff --git a/charts/tidb-cluster/values.yaml b/charts/tidb-cluster/values.yaml
@@ -410,6 +410,9 @@ binlog:
     # refer to https://kubernetes.io/docs/concepts/storage/storage-classes
     storageClassName: local-storage
     storage: 20Gi
+    # affinity for pump pod assignment, default: empty
+    # ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+    affinity: {}
     syncLog: true
     # a integer value to control expiry date of the binlog data, indicates for how long (in days) the binlog data would be stored.
     # must bigger than 0
@@ -428,6 +431,9 @@ binlog:
     # refer to https://kubernetes.io/docs/concepts/storage/storage-classes
     storageClassName: local-storage
     storage: 10Gi
+    # affinity for drainer pod assignment, default: empty
+    # ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+    affinity: {}
     # the number of the concurrency of the downstream for synchronization. The bigger the value,
     # the better throughput performance of the concurrency (16 by default)
     workerCount: 16

diff --git a/tests/actions.go b/tests/actions.go
@@ -2348,6 +2348,10 @@ func (oa *operatorActions) CheckIncrementalBackup(info *TidbClusterConfig, withD
 				glog.Errorf("some pods is not health %s ,%v", pumpStatefulSetName, err)
 				return false, nil
 			}
+			glog.Info(pod.Spec.Affinity)
+			if len(pod.Spec.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution) != 1 {
+				return true, fmt.Errorf("pump pod %s/%s should have affinity set", pod.Namespace, pod.Name)
+			}
 		}
 
 		if !withDrainer {
@@ -2379,6 +2383,10 @@ func (oa *operatorActions) CheckIncrementalBackup(info *TidbClusterConfig, withD
 			if !oa.drainerHealth(info, pod.Spec.Hostname) {
 				return false, nil
 			}
+			glog.Info(pod.Spec.Affinity)
+			if len(pod.Spec.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution) != 1 {
+				return true, fmt.Errorf("drainer pod %s/%s should have spec.affinity set", pod.Namespace, pod.Name)
+			}
 		}
 
 		return true, nil

diff --git a/tests/util.go b/tests/util.go
@@ -104,6 +104,25 @@ var affinityTemp string = `{{.Kind}}:
           topologyKey: {{.TopologyKey}}
           namespaces:
           - {{.Namespace}}
+binlog:
+  pump:
+    affinity:
+      podAntiAffinity:
+        preferredDuringSchedulingIgnoredDuringExecution:
+        - weight: 50
+          podAffinityTerm:
+            topologyKey: rack
+            namespaces:
+            - e2e
+  drainer:
+    affinity:
+      podAntiAffinity:
+        preferredDuringSchedulingIgnoredDuringExecution:
+        - weight: 50
+          podAffinityTerm:
+            topologyKey: rack
+            namespaces:
+            - e2e
 `
 
 type AffinityInfo struct {