address comments

pingcap · Apr 21, 2020 · b4253a1 · b4253a1
1 parent 7879114
commit b4253a1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/pkg/manager/member/orphan_pods_cleaner.go b/pkg/manager/member/orphan_pods_cleaner.go
@@ -92,22 +92,22 @@ func (opc *orphanPodsCleaner) Clean(tc *v1alpha1.TidbCluster) (map[string]string
 			continue
 		}
 
-		var pvcName []string
+		var pvcNames []string
 		for _, vol := range pod.Spec.Volumes {
 			if vol.PersistentVolumeClaim != nil {
 				if vol.PersistentVolumeClaim.ClaimName != "" {
-					pvcName = append(pvcName, vol.PersistentVolumeClaim.ClaimName)
+					pvcNames = append(pvcNames, vol.PersistentVolumeClaim.ClaimName)
 				}
 			}
 		}
-		if len(pvcName) < 1 {
+		if len(pvcNames) < 1 {
 			skipReason[podName] = skipReasonOrphanPodsCleanerPVCNameIsEmpty
 			continue
 		}
 
 		var err error
 		var pvcNotFound bool
-		for _, p := range pvcName {
+		for _, p := range pvcNames {
 			// check informer cache
 			_, err = opc.pvcLister.PersistentVolumeClaims(ns).Get(p)
 			if err == nil {

diff --git a/pkg/manager/member/pd_member_manager.go b/pkg/manager/member/pd_member_manager.go
@@ -713,6 +713,8 @@ func getPDConfigMap(tc *v1alpha1.TidbCluster) (*corev1.ConfigMap, error) {
 		config.Dashboard.TiDBCertPath = path.Join(tidbClientCertPath, corev1.TLSCertKey)
 		config.Dashboard.TiDBKeyPath = path.Join(tidbClientCertPath, corev1.TLSPrivateKeyKey)
 	}
+	// TiFlash requires PD to enable the `replication.enable-placement-rules`
+	// Check detail in https://pingcap.com/docs/stable/reference/tiflash/deploy/
 	if tc.Spec.TiFlash != nil {
 		if config.Replication == nil {
 			config.Replication = &v1alpha1.PDReplicationConfig{}