address comment

Signed-off-by: HunDunDM <[email protected]>
tikv · Aug 2, 2021 · 89b6ff4 · 89b6ff4
1 parent 81d6c9d
commit 89b6ff4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/server/cluster/cluster.go b/server/cluster/cluster.go
@@ -566,7 +566,7 @@ func (c *RaftCluster) HandleStoreHeartbeat(stats *pdpb.StoreStats) error {
 	return nil
 }
 
-var regionGuide = core.GenerateRegionGuideFunc(log.Debug, log.Info)
+var regionGuide = core.GenerateRegionGuideFunc(true)
 
 // processRegionHeartbeat updates the region information.
 func (c *RaftCluster) processRegionHeartbeat(region *core.RegionInfo) error {

diff --git a/server/core/region.go b/server/core/region.go
@@ -27,6 +27,7 @@ import (
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/kvproto/pkg/replication_modepb"
+	"github.com/pingcap/log"
 	"github.com/tikv/pd/pkg/logutil"
 	"go.uber.org/zap"
 )
@@ -466,13 +467,12 @@ type RegionGuideFunc func(region, origin *RegionInfo) (isNew, saveKV, saveCache,
 
 // GenerateRegionGuideFunc is used to generate a RegionGuideFunc. Control the log output by specifying the log function.
 // nil means do not print the log.
-func GenerateRegionGuideFunc(debug, info func(msg string, fields ...zap.Field)) RegionGuideFunc {
+func GenerateRegionGuideFunc(enableLog bool) RegionGuideFunc {
 	noLog := func(msg string, fields ...zap.Field) {}
-	if debug == nil {
-		debug = noLog
-	}
-	if info == nil {
-		info = noLog
+	debug, info := noLog, noLog
+	if enableLog {
+		debug = log.Debug
+		info = log.Info
 	}
 	// Save to storage if meta is updated.
 	// Save to cache if meta or leader is updated, or contains any down/pending peer.

diff --git a/server/region_syncer/client.go b/server/region_syncer/client.go
@@ -123,7 +123,7 @@ func (s *RegionSyncer) syncRegion(conn *grpc.ClientConn) (ClientStream, error) {
 	return syncStream, nil
 }
 
-var regionGuide = core.GenerateRegionGuideFunc(nil, nil)
+var regionGuide = core.GenerateRegionGuideFunc(false)
 
 // StartSyncWithLeader starts to sync with leader.
 func (s *RegionSyncer) StartSyncWithLeader(addr string) {