Fix tiflash not start with newest nightly PD (pingcap#902)

lucklove · web-flow · commit 402079dbc40b · 2020-11-16T18:06:01.000+08:00
diff --git a/components/playground/instance/tiflash.go b/components/playground/instance/tiflash.go
@@ -77,7 +77,8 @@ type scheduleConfig struct {
 }
 
 type replicateMaxReplicaConfig struct {
-	MaxReplicas int `json:"max-replicas"`
+	MaxReplicas          int    `json:"max-replicas"`
+	EnablePlacementRules string `json:"enable-placement-rules"`
 }
 
 type replicateEnablePlacementRulesConfig struct {
@@ -128,7 +129,8 @@ func (inst *TiFlashInstance) Start(ctx context.Context, version v0manifest.Versi
 	}
 	// Update maxReplicas before placement rules so that it would not be overwritten
 	maxReplicas, err := json.Marshal(replicateMaxReplicaConfig{
-		MaxReplicas: 1,
+		MaxReplicas:          1,
+		EnablePlacementRules: "false",
 	})
 	if err != nil {
 		return err

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,8 @@ type scheduleConfig struct {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`type replicateMaxReplicaConfig struct {`
`80`		- MaxReplicas int `json:"max-replicas"`
	`80`	+ MaxReplicas int `json:"max-replicas"`
	`81`	+ EnablePlacementRules string `json:"enable-placement-rules"`
`81`	`82`	`}`
`82`	`83`
`83`	`84`	`type replicateEnablePlacementRulesConfig struct {`
`@@ -128,7 +129,8 @@ func (inst *TiFlashInstance) Start(ctx context.Context, version v0manifest.Versi`
`128`	`129`	`}`
`129`	`130`	`// Update maxReplicas before placement rules so that it would not be overwritten`
`130`	`131`	`maxReplicas, err := json.Marshal(replicateMaxReplicaConfig{`
`131`		`- MaxReplicas: 1,`
	`132`	`+ MaxReplicas: 1,`
	`133`	`+ EnablePlacementRules: "false",`
`132`	`134`	`})`
`133`	`135`	`if err != nil {`
`134`	`136`	`return err`