diff --git a/docs/api-references/docs.md b/docs/api-references/docs.md index a676271b16..59db8be16b 100644 --- a/docs/api-references/docs.md +++ b/docs/api-references/docs.md @@ -2560,7 +2560,7 @@ int64
loger
+logger
FlashLogger
diff --git a/manifests/crd.yaml b/manifests/crd.yaml
index 9201b43b04..44aae164e0 100644
--- 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
index cd16aa5979..d429e1d949 100644
--- a/pkg/apis/pingcap/v1alpha1/openapi_generated.go
+++ b/pkg/apis/pingcap/v1alpha1/openapi_generated.go
@@ -1014,7 +1014,7 @@ func schema_pkg_apis_pingcap_v1alpha1_CommonConfig(ref common.ReferenceCallback)
Ref: ref("github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1.Flash"),
},
},
- "loger": {
+ "logger": {
SchemaProps: spec.SchemaProps{
Ref: ref("github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1.FlashLogger"),
},
diff --git a/pkg/apis/pingcap/v1alpha1/tiflash_config.go b/pkg/apis/pingcap/v1alpha1/tiflash_config.go
index be35c1da41..b8b9545c6e 100644
--- 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
index fad42640d9..5735cab345 100644
--- 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
index 1464044934..d622a1a64b 100644
--- 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{