cherry pick #2916 to release-4.0

Signed-off-by: Ryan Leung <rleungx@gmail.com>
tikv · Sep 7, 2020 · 5becb79 · 5becb79
1 parent a1d3230
commit 5becb79
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/cmd/pd-server/main.go b/cmd/pd-server/main.go
@@ -91,7 +91,7 @@ func main() {
 
 	err = join.PrepareJoinCluster(cfg)
 	if err != nil {
-		log.Fatal("join meet error", zap.Error(err))
+		log.Fatal("join meet error", errs.ZapError(err))
 	}
 
 	// Creates server.
@@ -117,7 +117,7 @@ func main() {
 	}()
 
 	if err := svr.Run(); err != nil {
-		log.Fatal("run server failed", zap.Error(err))
+		log.Fatal("run server failed", errs.ZapError(err))
 	}
 
 	<-ctx.Done()

diff --git a/server/cluster/cluster.go b/server/cluster/cluster.go
@@ -1777,7 +1777,7 @@ func CheckHealth(client *http.Client, members []*pdpb.Member) map[uint64]*pdpb.M
 			ctx, cancel := context.WithTimeout(context.Background(), clientTimeout)
 			req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("%s%s", cURL, healthURL), nil)
 			if err != nil {
-				log.Error("failed to new request", zap.Error(err))
+				log.Error("failed to new request", errs.ZapError(errs.ErrNewHTTPRequest, err))
 				cancel()
 				continue
 			}

diff --git a/server/region_syncer/client.go b/server/region_syncer/client.go
@@ -128,7 +128,7 @@ func (s *RegionSyncer) StartSyncWithLeader(addr string) {
 		// used to load region from kv storage to cache storage.
 		err := s.server.GetStorage().LoadRegionsOnce(s.server.GetBasicCluster().CheckAndPutRegion)
 		if err != nil {
-			log.Warn("failed to load regions.", zap.Error(err))
+			log.Warn("failed to load regions.", errs.ZapError(err))
 		}
 		// establish client.
 		var conn *grpc.ClientConn

diff --git a/server/schedule/checker/replica_checker.go b/server/schedule/checker/replica_checker.go
@@ -18,6 +18,7 @@ import (
 
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/log"
+	"github.com/tikv/pd/pkg/errs"
 	"github.com/tikv/pd/server/core"
 	"github.com/tikv/pd/server/schedule/filter"
 	"github.com/tikv/pd/server/schedule/operator"
@@ -91,7 +92,7 @@ func (r *ReplicaChecker) Check(region *core.RegionInfo) *operator.Operator {
 		checkerCounter.WithLabelValues("replica_checker", "new-operator").Inc()
 		op, err := operator.CreateAddPeerOperator("make-up-replica", r.cluster, region, newPeer, operator.OpReplica)
 		if err != nil {
-			log.Debug("create make-up-replica operator fail", zap.Error(err))
+			log.Debug("create make-up-replica operator fail", errs.ZapError(err))
 			return nil
 		}
 		return op

diff --git a/server/server.go b/server/server.go
@@ -1145,7 +1145,7 @@ func (s *Server) campaignLeader() {
 	// Try to create raft cluster.
 	err = s.createRaftCluster()
 	if err != nil {
-		log.Error("failed to create raft cluster", zap.Error(err))
+		log.Error("failed to create raft cluster", errs.ZapError(err))
 		return
 	}
 	defer s.stopRaftCluster()
@@ -1175,7 +1175,7 @@ func (s *Server) campaignLeader() {
 			}
 		case <-tsTicker.C:
 			if err = s.tso.UpdateTimestamp(); err != nil {
-				log.Error("failed to update timestamp", zap.Error(err))
+				log.Error("failed to update timestamp", errs.ZapError(err))
 				return
 			}
 		case <-ctx.Done():

diff --git a/server/tso/tso.go b/server/tso/tso.go
@@ -308,7 +308,7 @@ func (t *TimestampOracle) GetRespTS(count uint32) (pdpb.Timestamp, error) {
 		if resp.Logical >= maxLogical {
 			log.Error("logical part outside of max logical interval, please check ntp time",
 				zap.Reflect("response", resp),
-				zap.Int("retry-count", i))
+				zap.Int("retry-count", i), errs.ZapError(errs.ErrLogicOverflow))
 			tsoCounter.WithLabelValues("logical_overflow").Inc()
 			time.Sleep(UpdateTimestampStep)
 			continue