Merge branch 'master' into comment-hint

pingcap · Apr 21, 2021 · 1ddbd0c · 1ddbd0c
2 parents 84ce2f7 + 3099c60
commit 1ddbd0c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/pkg/cluster/manager/scale_out.go b/pkg/cluster/manager/scale_out.go
@@ -204,7 +204,7 @@ set them in the specification fileds for each host.`))
 			if err := cliutil.PromptForConfirmOrAbortError("Do you want to continue? [y/N]: "); err != nil {
 				return err
 			}
-			return nil // user confirmed, skip futher checks
+			return nil // user confirmed, skip further checks
 		}
 	}
 	return nil

diff --git a/pkg/cluster/template/scripts/pd.go b/pkg/cluster/template/scripts/pd.go
@@ -57,6 +57,11 @@ func NewPDScript(name, ip, deployDir, dataDir, logDir string) *PDScript {
 	}
 }
 
+func (c *PDScript) resetAdvertise() {
+	c.AdvertiseClientAddr = fmt.Sprintf("%s://%s:%d", c.Scheme, c.IP, c.ClientPort)
+	c.AdvertisePeerAddr = fmt.Sprintf("%s://%s:%d", c.Scheme, c.IP, c.PeerPort)
+}
+
 // WithListenHost set listenHost field of PDScript
 func (c *PDScript) WithListenHost(listenHost string) *PDScript {
 	c.ListenHost = listenHost
@@ -66,20 +71,21 @@ func (c *PDScript) WithListenHost(listenHost string) *PDScript {
 // WithScheme set Scheme field of PDScript
 func (c *PDScript) WithScheme(scheme string) *PDScript {
 	c.Scheme = scheme
-	c.AdvertiseClientAddr = fmt.Sprintf("%s://%s:%d", c.Scheme, c.IP, c.ClientPort)
-	c.AdvertisePeerAddr = fmt.Sprintf("%s://%s:%d", c.Scheme, c.IP, c.PeerPort)
+	c.resetAdvertise()
 	return c
 }
 
 // WithClientPort set ClientPort field of PDScript
 func (c *PDScript) WithClientPort(port int) *PDScript {
 	c.ClientPort = port
+	c.resetAdvertise()
 	return c
 }
 
 // WithPeerPort set PeerPort field of PDScript
 func (c *PDScript) WithPeerPort(port int) *PDScript {
 	c.PeerPort = port
+	c.resetAdvertise()
 	return c
 }