Merge branch 'master' into hot_region

tikv · Apr 10, 2023 · 8c3359f · 8c3359f
2 parents 48e8258 + bfdc7ec
commit 8c3359f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/client/pd_service_discovery.go b/client/pd_service_discovery.go
@@ -218,7 +218,7 @@ func (c *pdServiceDiscovery) updateMemberLoop() {
 			failpoint.Continue()
 		})
 		if err := c.updateMember(); err != nil {
-			log.Error("[pd] failed to update member", errs.ZapError(err))
+			log.Error("[pd] failed to update member", zap.Strings("urls", c.GetURLs()), errs.ZapError(err))
 		}
 	}
 }
@@ -453,7 +453,7 @@ func (c *pdServiceDiscovery) updateMember() error {
 		// the error of `switchTSOAllocatorLeader` will be returned.
 		return errTSO
 	}
-	return errs.ErrClientGetMember.FastGenByArgs(c.GetURLs())
+	return errs.ErrClientGetMember.FastGenByArgs()
 }
 
 func (c *pdServiceDiscovery) getClusterInfo(ctx context.Context, url string, timeout time.Duration) (*pdpb.GetClusterInfoResponse, error) {

diff --git a/pkg/schedule/schedulers/hot_region_test.go b/pkg/schedule/schedulers/hot_region_test.go
@@ -1122,6 +1122,7 @@ func TestHotReadRegionScheduleByteRateOnly(t *testing.T) {
 		tc.RemoveRegion(r)
 		tc.RemoveRegionFromSubTree(r)
 	}
+	hb.updateReadTime = time.Now().Add(-time.Second)
 	hb.Schedule(tc, false)
 	re.Contains(hb.regionPendings, uint64(4))
 	re.True(typeutil.Float64Equal(509.0*units.KiB, hb.regionPendings[4].origin.Loads[statistics.RegionReadBytes]))

diff --git a/tests/integrations/tso/server_test.go b/tests/integrations/tso/server_test.go
@@ -153,8 +153,8 @@ func (suite *tsoServerTestSuite) TestConcurrentlyReset() {
 	for i := 0; i < 2; i++ {
 		go func() {
 			defer wg.Done()
-			for i := 0; i <= 100; i++ {
-				physical := now.Add(time.Duration(2*i)*time.Minute).UnixNano() / int64(time.Millisecond)
+			for j := 0; j <= 100; j++ {
+				physical := now.Add(time.Duration(2*j)*time.Minute).UnixNano() / int64(time.Millisecond)
 				ts := uint64(physical << 18)
 				suite.resetTS(ts, false, false)
 			}