address comment

Signed-off-by: HunDunDM <hundundm@gmail.com>
tikv · Nov 8, 2021 · ffdc728 · ffdc728
1 parent c73c91c
commit ffdc728
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/server/core/region.go b/server/core/region.go
@@ -568,7 +568,7 @@ func GenerateRegionGuideFunc(enableLog bool) RegionGuideFunc {
 			// Because keys and bytes are strongly related, only bytes are judged.
 			if region.GetRoundBytesWritten() != origin.GetRoundBytesWritten() ||
 				region.GetRoundBytesRead() != origin.GetRoundBytesRead() ||
-				region.flowRoundDivisor != origin.flowRoundDivisor {
+				region.flowRoundDivisor < origin.flowRoundDivisor {
 				saveCache, needSync = true, true
 			}
 

diff --git a/server/core/region_test.go b/server/core/region_test.go
@@ -262,19 +262,19 @@ func (s *testRegionGuideSuite) TestNeedSync(c *C) {
 		needSync bool
 	}{
 		{
-			optionsA: []RegionCreateOption{WithLeader(nil)},
+			optionsB: []RegionCreateOption{WithLeader(nil)},
 			needSync: true,
 		},
 		{
-			optionsA: []RegionCreateOption{WithLeader(meta.Peers[1])},
+			optionsB: []RegionCreateOption{WithLeader(meta.Peers[1])},
 			needSync: true,
 		},
 		{
-			optionsA: []RegionCreateOption{WithPendingPeers(meta.Peers[1:2])},
+			optionsB: []RegionCreateOption{WithPendingPeers(meta.Peers[1:2])},
 			needSync: true,
 		},
 		{
-			optionsA: []RegionCreateOption{WithDownPeers([]*pdpb.PeerStats{{Peer: meta.Peers[1], DownSeconds: 600}})},
+			optionsB: []RegionCreateOption{WithDownPeers([]*pdpb.PeerStats{{Peer: meta.Peers[1], DownSeconds: 600}})},
 			needSync: true,
 		},
 		{
@@ -300,6 +300,11 @@ func (s *testRegionGuideSuite) TestNeedSync(c *C) {
 		{
 			optionsA: []RegionCreateOption{SetWrittenBytes(100000), WithFlowRoundByDigit(127)},
 			optionsB: []RegionCreateOption{SetWrittenBytes(0), WithFlowRoundByDigit(2)},
+			needSync: false,
+		},
+		{
+			optionsA: []RegionCreateOption{SetWrittenBytes(0), WithFlowRoundByDigit(2)},
+			optionsB: []RegionCreateOption{SetWrittenBytes(100000), WithFlowRoundByDigit(127)},
 			needSync: true,
 		},
 	}

diff --git a/server/grpc_service.go b/server/grpc_service.go
@@ -667,13 +667,13 @@ func (s *heartbeatServer) Recv() (*pdpb.RegionHeartbeatRequest, error) {
 // RegionHeartbeat implements gRPC PDServer.
 func (s *Server) RegionHeartbeat(stream pdpb.PD_RegionHeartbeatServer) error {
 	var (
-		server                       = &heartbeatServer{stream: stream}
-		regionFlowRoundByDigitOption = core.WithFlowRoundByDigit(s.persistOptions.GetPDServerConfig().FlowRoundByDigit)
-		forwardStream                pdpb.PD_RegionHeartbeatClient
-		cancel                       context.CancelFunc
-		lastForwardedHost            string
-		lastBind                     time.Time
-		errCh                        chan error
+		server            = &heartbeatServer{stream: stream}
+		flowRoundOption   = core.WithFlowRoundByDigit(s.persistOptions.GetPDServerConfig().FlowRoundByDigit)
+		forwardStream     pdpb.PD_RegionHeartbeatClient
+		cancel            context.CancelFunc
+		lastForwardedHost string
+		lastBind          time.Time
+		errCh             chan error
 	)
 	defer func() {
 		// cancel the forward stream
@@ -750,11 +750,11 @@ func (s *Server) RegionHeartbeat(stream pdpb.PD_RegionHeartbeatServer) error {
 			regionHeartbeatCounter.WithLabelValues(storeAddress, storeLabel, "report", "bind").Inc()
 			s.hbStreams.BindStream(storeID, server)
 			// refresh FlowRoundByDigit
-			regionFlowRoundByDigitOption = core.WithFlowRoundByDigit(s.persistOptions.GetPDServerConfig().FlowRoundByDigit)
+			flowRoundOption = core.WithFlowRoundByDigit(s.persistOptions.GetPDServerConfig().FlowRoundByDigit)
 			lastBind = time.Now()
 		}
 
-		region := core.RegionFromHeartbeat(request, regionFlowRoundByDigitOption)
+		region := core.RegionFromHeartbeat(request, flowRoundOption)
 		if region.GetLeader() == nil {
 			log.Error("invalid request, the leader is nil", zap.Reflect("request", request), errs.ZapError(errs.ErrLeaderNil))
 			regionHeartbeatCounter.WithLabelValues(storeAddress, storeLabel, "report", "invalid-leader").Inc()