etcdutil: revert etcd client without multi endpoint (#6374)

ref #6124 Signed-off-by: lhy1024 <admin@liudos.us> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
tikv · Apr 25, 2023 · 574461f · 574461f
1 parent ef7c10b
commit 574461f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/pkg/mcs/resource_manager/server/server.go b/pkg/mcs/resource_manager/server/server.go
@@ -264,7 +264,7 @@ func (s *Server) initClient() error {
 	if err != nil {
 		return err
 	}
-	s.etcdClient, s.httpClient, err = etcdutil.CreateClientsWithMultiEndpoint(tlsConfig, []url.URL(u))
+	s.etcdClient, s.httpClient, err = etcdutil.CreateClients(tlsConfig, []url.URL(u)[0])
 	return err
 }
 

diff --git a/pkg/mcs/tso/server/server.go b/pkg/mcs/tso/server/server.go
@@ -359,7 +359,7 @@ func (s *Server) initClient() error {
 	if err != nil {
 		return err
 	}
-	s.etcdClient, s.httpClient, err = etcdutil.CreateClientsWithMultiEndpoint(tlsConfig, s.backendUrls)
+	s.etcdClient, s.httpClient, err = etcdutil.CreateClients(tlsConfig, s.backendUrls[0])
 	return err
 }
 

diff --git a/pkg/utils/etcdutil/etcdutil_test.go b/pkg/utils/etcdutil/etcdutil_test.go
@@ -260,6 +260,33 @@ func TestEtcdWithHangLeaderEnableCheck(t *testing.T) {
 	require.NoError(t, failpoint.Disable("github.com/tikv/pd/pkg/utils/etcdutil/closeKeepAliveCheck"))
 }
 
+func TestEtcdScaleInAndOutWithoutMultiPoint(t *testing.T) {
+	re := require.New(t)
+	// Start a etcd server.
+	cfg1 := NewTestSingleConfig(t)
+	etcd1, err := embed.StartEtcd(cfg1)
+	re.NoError(err)
+	ep1 := cfg1.LCUrls[0].String()
+	<-etcd1.Server.ReadyNotify()
+
+	// Create two etcd clients with etcd1 as endpoint.
+	urls, err := types.NewURLs([]string{ep1})
+	re.NoError(err)
+	client1, err := createEtcdClient(nil, urls[0]) // execute member change operation with this client
+	re.NoError(err)
+	client2, err := createEtcdClient(nil, urls[0]) // check member change with this client
+	re.NoError(err)
+
+	// Add a new member and check members
+	etcd2 := checkAddEtcdMember(t, cfg1, client1)
+	checkMembers(re, client2, []*embed.Etcd{etcd1, etcd2})
+
+	// scale in etcd1
+	_, err = RemoveEtcdMember(client1, uint64(etcd1.Server.ID()))
+	re.NoError(err)
+	checkMembers(re, client2, []*embed.Etcd{etcd2})
+}
+
 func checkEtcdWithHangLeader(t *testing.T) error {
 	re := require.New(t)
 	// Start a etcd server.