From 1e612e0d325f44e5b129e4004d065311f95fc510 Mon Sep 17 00:00:00 2001
From: lhy1024 <admin@liudos.us>
Date: Tue, 4 Jul 2023 23:55:41 +0800
Subject: [PATCH] address comments

Signed-off-by: lhy1024 <admin@liudos.us>
---
 pkg/election/leadership_test.go | 1 +
 pkg/utils/etcdutil/etcdutil.go  | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/election/leadership_test.go b/pkg/election/leadership_test.go
index 5a394de56e1..1021462a902 100644
--- a/pkg/election/leadership_test.go
+++ b/pkg/election/leadership_test.go
@@ -120,6 +120,7 @@ func TestLeadership(t *testing.T) {
 	re.NoError(lease1.Close())
 	re.NoError(lease2.Close())
 }
+
 func TestExitWatch(t *testing.T) {
 	re := require.New(t)
 	leaderKey := "/test_leader"
diff --git a/pkg/utils/etcdutil/etcdutil.go b/pkg/utils/etcdutil/etcdutil.go
index dc1df7e4ca8..02b86bcae31 100644
--- a/pkg/utils/etcdutil/etcdutil.go
+++ b/pkg/utils/etcdutil/etcdutil.go
@@ -268,6 +268,7 @@ func CreateEtcdClient(tlsConfig *tls.Config, acURLs []url.URL) (*clientv3.Client
 		for {
 			select {
 			case <-client.Ctx().Done():
+				log.Info("[etcd client] etcd client is closed, exit health check goroutine")
 				return
 			case <-ticker.C:
 				usedEps := client.Endpoints()
@@ -302,6 +303,7 @@ func CreateEtcdClient(tlsConfig *tls.Config, acURLs []url.URL) (*clientv3.Client
 		for {
 			select {
 			case <-client.Ctx().Done():
+				log.Info("[etcd client] etcd client is closed, exit update endpoint goroutine")
 				return
 			case <-ticker.C:
 				eps := syncUrls(client)
@@ -371,6 +373,7 @@ func (checker *healthyChecker) update(eps []string) {
 			if time.Since(lastHealthy) > etcdServerDisconnectedTimeout {
 				// try to update client to trigger reconnect
 				checker.addClient(ep, lastHealthy)
+				client.(*healthyClient).Close()
 			}
 			continue
 		}
@@ -394,15 +397,11 @@ func syncUrls(client *clientv3.Client) []string {
 	// See https://github.com/etcd-io/etcd/blob/85b640cee793e25f3837c47200089d14a8392dc7/clientv3/client.go#L170-L183
 	ctx, cancel := context.WithTimeout(clientv3.WithRequireLeader(client.Ctx()), DefaultRequestTimeout)
 	defer cancel()
-	now := time.Now()
 	mresp, err := client.MemberList(ctx)
 	if err != nil {
 		log.Error("[etcd client] failed to list members", errs.ZapError(err))
 		return []string{}
 	}
-	if time.Since(now) > defaultEtcdClientTimeout {
-		log.Warn("[etcd client] sync etcd members slow", zap.Duration("cost", time.Since(now)), zap.Int("members", len(mresp.Members)))
-	}
 	var eps []string
 	for _, m := range mresp.Members {
 		if len(m.Name) != 0 && !m.IsLearner {