fix typo and other issues (#2242)

pingcap · Apr 23, 2020 · 2ce86ef · 2ce86ef
1 parent e49547c
commit 2ce86ef
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/docs/api-references/docs.md b/docs/api-references/docs.md
@@ -2560,7 +2560,7 @@ int64
 </tr>
 <tr>
 <td>
-<code>loger</code></br>
+<code>logger</code></br>
 <em>
 <a href="#pingcap.com/v1alpha1.FlashLogger">
 FlashLogger

diff --git a/manifests/crd.yaml b/manifests/crd.yaml
@@ -5080,7 +5080,7 @@ spec:
                               format: double
                               type: number
                           type: object
-                        loger:
+                        logger:
                           description: FlashLogger is the configuration of [logger]
                             section.
                           properties:

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/tiflash_config.go b/pkg/apis/pingcap/v1alpha1/tiflash_config.go
@@ -129,7 +129,7 @@ type CommonConfig struct {
 	// +optional
 	Flash *Flash `json:"flash,omitempty" toml:"flash,omitempty"`
 	// +optional
-	FlashLogger *FlashLogger `json:"loger,omitempty" toml:"logger,omitempty"`
+	FlashLogger *FlashLogger `json:"logger,omitempty" toml:"logger,omitempty"`
 	// +optional
 	// +k8s:openapi-gen=false
 	FlashApplication *FlashApplication `json:"application,omitempty" toml:"application,omitempty"`

diff --git a/pkg/manager/member/pd_member_manager.go b/pkg/manager/member/pd_member_manager.go
@@ -713,7 +713,17 @@ 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{}
+		}
+		if config.Replication.EnablePlacementRules == nil {
+			enable := true
+			config.Replication.EnablePlacementRules = &enable
+		}
+	}
 	confText, err := MarshalTOML(config)
 	if err != nil {
 		return nil, err

diff --git a/pkg/manager/member/tiflash_member_manager.go b/pkg/manager/member/tiflash_member_manager.go
@@ -425,7 +425,7 @@ func getNewStatefulSet(tc *v1alpha1.TidbCluster, cm *corev1.ConfigMap) (*apps.St
 		},
 		{
 			Name:  "TZ",
-			Value: tc.Spec.Timezone,
+			Value: tc.Timezone(),
 		},
 	}
 	tiflashContainer := corev1.Container{