address comment

Signed-off-by: husharp <[email protected]>
HuSharp · Aug 29, 2023 · c700180 · c700180
1 parent 83ddbf5
commit c700180
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/client/base_client.go b/client/base_client.go
@@ -134,7 +134,7 @@ func (c *baseClient) memberLoop() {
 	ticker := time.NewTicker(memberUpdateInterval)
 	defer ticker.Stop()
 
-	bo := retry.InitialBackOffer(100*time.Millisecond, updateMemberTimeout)
+	bo := retry.InitialBackOffer(updateMemberBackOffBaseTime, updateMemberTimeout)
 	for {
 		select {
 		case <-c.checkLeaderCh:

diff --git a/client/client.go b/client/client.go
@@ -326,12 +326,13 @@ type lastTSO struct {
 }
 
 const (
-	dialTimeout            = 3 * time.Second
-	updateMemberTimeout    = time.Second // Use a shorter timeout to recover faster from network isolation.
-	tsLoopDCCheckInterval  = time.Minute
-	defaultMaxTSOBatchSize = 10000 // should be higher if client is sending requests in burst
-	retryInterval          = 500 * time.Millisecond
-	maxRetryTimes          = 6
+	dialTimeout                 = 3 * time.Second
+	updateMemberTimeout         = time.Second // Use a shorter timeout to recover faster from network isolation.
+	tsLoopDCCheckInterval       = time.Minute
+	defaultMaxTSOBatchSize      = 10000 // should be higher if client is sending requests in burst
+	retryInterval               = 500 * time.Millisecond
+	maxRetryTimes               = 6
+	updateMemberBackOffBaseTime = 100 * time.Millisecond
 )
 
 // LeaderHealthCheckInterval might be changed in the unit to shorten the testing time.
@@ -766,7 +767,7 @@ func (c *client) handleDispatcher(
 
 	// Loop through each batch of TSO requests and send them for processing.
 	streamLoopTimer := time.NewTimer(c.option.timeout)
-	bo := retry.InitialBackOffer(100*time.Millisecond, updateMemberTimeout)
+	bo := retry.InitialBackOffer(updateMemberBackOffBaseTime, updateMemberTimeout)
 tsoBatchLoop:
 	for {
 		select {

diff --git a/tests/client/client_test.go b/tests/client/client_test.go
@@ -1437,7 +1437,7 @@ func (suite *clientTestSuite) TestMemberUpdateBackOff() {
 	re.NoError(failpoint.Enable("github.com/tikv/pd/server/leaderLoopCheckAgain", fmt.Sprintf("return(\"%d\")", memberID)))
 	re.NoError(failpoint.Enable("github.com/tikv/pd/server/exitCampaignLeader", fmt.Sprintf("return(\"%d\")", memberID)))
 	re.NoError(failpoint.Enable("github.com/tikv/pd/server/timeoutWaitPDLeader", `return(true)`))
-
+	// make sure back off executed.
 	re.NoError(failpoint.Enable("github.com/tikv/pd/client/retry/backOffExecute", `return(true)`))
 	leader2 := waitLeaderChange(re, cluster, leader, cli.(client))
 	re.True(retry.TestBackOffExecute())