Merge 78ccf34 into a7aa964

pingcap · Jul 17, 2023 · 5d813c0 · 5d813c0
2 parents a7aa964 + 78ccf34
commit 5d813c0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/cluster/spec/tiflash.go b/pkg/cluster/spec/tiflash.go
@@ -881,7 +881,7 @@ func (i *TiFlashInstance) PrepareStart(ctx context.Context, tlsCfg *tls.Config)
 func (i *TiFlashInstance) Ready(ctx context.Context, e ctxt.Executor, timeout uint64, tlsCfg *tls.Config) error {
 	// FIXME: the timeout is applied twice in the whole `Ready()` process, in the worst
 	// case it might wait double time as other components
-	if err := PortStarted(ctx, e, i.Port, timeout); err != nil {
+	if err := PortStarted(ctx, e, i.GetServicePort(), timeout); err != nil {
 		return err
 	}
 

diff --git a/pkg/tidbver/tidbver.go b/pkg/tidbver/tidbver.go
@@ -72,7 +72,7 @@ func TiFlashNotNeedHTTPPortConfig(version string) bool {
 // and we must make sure the port is being configured as specified in the topology file,
 // otherwise multiple TiFlash instances will conflict.
 func TiFlashRequiresTCPPortConfig(version string) bool {
-	return semver.Compare(version, "v7.1.0") < 0
+	return semver.Compare(version, "v7.1.0") < 0 && !strings.Contains(version, "nightly")
 }
 
 // TiFlashNotNeedSomeConfig return if given version of TiFlash do not need some config like runAsDaemon