add store labels (#3784) (#3813)

* cherry pick #3784 to release-1.1 Signed-off-by: ti-srebot <ti-srebot@pingcap.com> * resolve conflict Co-authored-by: zyy <zhangyunyu@zhihu.com> Co-authored-by: DanielZhangQD <zhanghailong810@aliyun.com> Co-authored-by: Ti Chi Robot <71242396+ti-chi-bot@users.noreply.github.com>
pingcap · Feb 25, 2021 · 6ebf6de · 6ebf6de
1 parent c9ce7c0
commit 6ebf6de
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 3 deletions.
diff --git a/docs/api-references/docs.md b/docs/api-references/docs.md
@@ -16395,6 +16395,18 @@ Defaults to 10m</p>
 <p>StorageVolumes configure additional storage for TiKV pods.</p>
 </td>
 </tr>
+<tr>
+<td>
+<code>storeLabels</code></br>
+<em>
+[]string
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>StoreLabels configures additional labels for TiKV stores.</p>
+</td>
+</tr>
 </tbody>
 </table>
 <h3 id="tikvstatus">TiKVStatus</h3>

diff --git a/manifests/crd.yaml b/manifests/crd.yaml
@@ -12784,6 +12784,10 @@ spec:
                 storageVolumes:
                   items: {}
                   type: array
+                storeLabels:
+                  items:
+                    type: string
+                  type: array
                 terminationGracePeriodSeconds:
                   format: int64
                   type: integer

diff --git a/pkg/apis/pingcap/v1alpha1/openapi_generated.go b/pkg/apis/pingcap/v1alpha1/openapi_generated.go
diff --git a/pkg/apis/pingcap/v1alpha1/types.go b/pkg/apis/pingcap/v1alpha1/types.go
@@ -450,6 +450,10 @@ type TiKVSpec struct {
 	// StorageVolumes configure additional storage for TiKV pods.
 	// +optional
 	StorageVolumes []StorageVolume `json:"storageVolumes,omitempty"`
+
+	// StoreLabels configures additional labels for TiKV stores.
+	// +optional
+	StoreLabels []string `json:"storeLabels,omitempty"`
 }
 
 // TiFlashSpec contains details of TiFlash members

diff --git a/pkg/apis/pingcap/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/pingcap/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/manager/member/tikv_member_manager.go b/pkg/manager/member/tikv_member_manager.go
@@ -807,8 +807,8 @@ func (m *tikvMemberManager) setStoreLabelsForTiKV(tc *v1alpha1.TidbCluster) (int
 		return setCount, err
 	}
 
-	locationLabels := []string(config.Replication.LocationLabels)
-	if locationLabels == nil {
+	storeLabels := append(config.Replication.LocationLabels, tc.Spec.TiKV.StoreLabels...)
+	if storeLabels == nil {
 		return setCount, nil
 	}
 
@@ -834,7 +834,7 @@ func (m *tikvMemberManager) setStoreLabelsForTiKV(tc *v1alpha1.TidbCluster) (int
 		}
 
 		nodeName := pod.Spec.NodeName
-		ls, err := m.getNodeLabels(nodeName, locationLabels)
+		ls, err := m.getNodeLabels(nodeName, storeLabels)
 		if err != nil || len(ls) == 0 {
 			klog.Warningf("node: [%s] has no node labels, skipping set store labels for Pod: [%s/%s]", nodeName, ns, podName)
 			continue