config: add initial-cluster-token config (#2691)

tikv · Jul 30, 2020 · dc8c75c · dc8c75c
1 parent a26d9cf
commit dc8c75c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/conf/config.toml b/conf/config.toml
@@ -14,6 +14,9 @@ advertise-peer-urls = ""
 initial-cluster = "pd=http://127.0.0.1:2380"
 initial-cluster-state = "new"
 
+## set different tokens to prevent communication between PDs in different clusters.
+# initial-cluster-token = "pd-cluster"
+
 lease = 3
 tso-save-interval = "3s"
 

diff --git a/server/config/config.go b/server/config/config.go
@@ -64,6 +64,7 @@ type Config struct {
 
 	InitialCluster      string `toml:"initial-cluster" json:"initial-cluster"`
 	InitialClusterState string `toml:"initial-cluster-state" json:"initial-cluster-state"`
+	InitialClusterToken string `toml:"initial-cluster-token" json:"initial-cluster-token"`
 
 	// Join to an existing pd cluster, a string of endpoints.
 	Join string `toml:"join" json:"join"`
@@ -187,6 +188,7 @@ const (
 	defaultClientUrls          = "http://127.0.0.1:2379"
 	defaultPeerUrls            = "http://127.0.0.1:2380"
 	defaultInitialClusterState = embed.ClusterStateFlagNew
+	defaultInitialClusterToken = "pd-cluster"
 
 	// etcd use 100ms for heartbeat and 1s for election timeout.
 	// We can enlarge both a little to reduce the network aggression.
@@ -479,6 +481,7 @@ func (c *Config) Adjust(meta *toml.MetaData) error {
 	}
 
 	adjustString(&c.InitialClusterState, defaultInitialClusterState)
+	adjustString(&c.InitialClusterToken, defaultInitialClusterToken)
 
 	if len(c.Join) > 0 {
 		if _, err := url.Parse(c.Join); err != nil {
@@ -1171,6 +1174,7 @@ func (c *Config) GenEmbedEtcdConfig() (*embed.Config, error) {
 	cfg.WalDir = ""
 	cfg.InitialCluster = c.InitialCluster
 	cfg.ClusterState = c.InitialClusterState
+	cfg.InitialClusterToken = c.InitialClusterToken
 	cfg.EnablePprof = true
 	cfg.PreVote = c.PreVote
 	cfg.StrictReconfigCheck = !c.DisableStrictReconfigCheck

diff --git a/tests/server/server_test.go b/tests/server/server_test.go
@@ -21,6 +21,7 @@ import (
 	"github.com/pingcap/pd/v4/pkg/tempurl"
 	"github.com/pingcap/pd/v4/pkg/testutil"
 	"github.com/pingcap/pd/v4/server"
+	"github.com/pingcap/pd/v4/server/config"
 	"github.com/pingcap/pd/v4/tests"
 	"go.uber.org/goleak"
 
@@ -113,6 +114,14 @@ func (s *serverTestSuite) TestClusterID(c *C) {
 	for _, s := range cluster.GetServers() {
 		c.Assert(s.GetClusterID(), Equals, clusterID)
 	}
+
+	cluster2, err := tests.NewTestCluster(s.ctx, 3, func(conf *config.Config) { conf.InitialClusterToken = "foobar" })
+	defer cluster2.Destroy()
+	c.Assert(err, IsNil)
+	err = cluster2.RunInitialServers()
+	c.Assert(err, IsNil)
+	clusterID2 := cluster2.GetServer("pd1").GetClusterID()
+	c.Assert(clusterID2, Not(Equals), clusterID)
 }
 
 func (s *serverTestSuite) TestLeader(c *C) {