server: Refine log error format (#2873) (#2911)

Signed-off-by: ti-srebot <[email protected]>
Signed-off-by: ZenoTan <[email protected]>

server/core/region_storage.go

@@ -19,7 +19,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/log"
 	"github.com/tikv/pd/pkg/errs"
@@ -140,7 +139,7 @@ func loadRegions(kv kv.Base, f func(region *RegionInfo) []*RegionInfo) error {
 		for _, s := range res {
 			region := &metapb.Region{}
 			if err := region.Unmarshal([]byte(s)); err != nil {
-				return errors.WithStack(err)
+				return errs.ErrProtoUnmarshal.Wrap(err).GenWithStackByArgs()
 			}
 
 			nextID = region.GetId() + 1
@@ -181,5 +180,9 @@ func (s *RegionStorage) Close() error {
 		log.Error("meet error before close the region storage", errs.ZapError(err))
 	}
 	s.regionStorageCancel()
-	return errors.WithStack(s.LeveldbKV.Close())
+	err = s.LeveldbKV.Close()
+	if err != nil {
+		return errs.ErrLevelDBClose.Wrap(err).GenWithStackByArgs()
+	}
+	return nil
 }

server/core/storage.go

@@ -217,7 +217,7 @@ func (s *Storage) LoadConfig(cfg interface{}) (bool, error) {
 	}
 	err = json.Unmarshal([]byte(value), cfg)
 	if err != nil {
-		return false, errors.WithStack(err)
+		return false, errs.ErrJSONUnmarshal.Wrap(err).GenWithStackByCause()
 	}
 	return true, nil
 }
@@ -264,7 +264,7 @@ func (s *Storage) LoadRules(f func(k, v string)) (bool, error) {
 func (s *Storage) SaveReplicationStatus(mode string, status interface{}) error {
 	value, err := json.Marshal(status)
 	if err != nil {
-		return errors.WithStack(err)
+		return errs.ErrJSONMarshal.Wrap(err).GenWithStackByArgs()
 	}
 	return s.Save(path.Join(replicationPath, mode), string(value))
 }
@@ -280,7 +280,7 @@ func (s *Storage) LoadReplicationStatus(mode string, status interface{}) (bool,
 	}
 	err = json.Unmarshal([]byte(v), status)
 	if err != nil {
-		return false, errors.WithStack(err)
+		return false, errs.ErrJSONUnmarshal.Wrap(err).GenWithStackByArgs()
 	}
 	return true, nil
 }
@@ -305,7 +305,7 @@ func (s *Storage) LoadComponent(component interface{}) (bool, error) {
 	}
 	err = json.Unmarshal([]byte(v), component)
 	if err != nil {
-		return false, errors.WithStack(err)
+		return false, errs.ErrJSONUnmarshal.Wrap(err).GenWithStackByArgs()
 	}
 	return true, nil
 }
@@ -323,7 +323,7 @@ func (s *Storage) LoadStores(f func(store *StoreInfo)) error {
 		for _, str := range res {
 			store := &metapb.Store{}
 			if err := store.Unmarshal([]byte(str)); err != nil {
-				return errors.WithStack(err)
+				return errs.ErrProtoUnmarshal.Wrap(err).GenWithStackByArgs()
 			}
 			leaderWeight, err := s.loadFloatWithDefaultValue(s.storeLeaderWeightPath(store.GetId()), 1.0)
 			if err != nil {
@@ -364,7 +364,7 @@ func (s *Storage) loadFloatWithDefaultValue(path string, def float64) (float64,
 	}
 	val, err := strconv.ParseFloat(res, 64)
 	if err != nil {
-		return 0, errors.WithStack(err)
+		return 0, errs.ErrStrconvParseFloat.Wrap(err).GenWithStackByArgs()
 	}
 	return val, nil
 }

server/grpc_service.go

@@ -26,6 +26,7 @@ import (
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
+	"github.com/tikv/pd/pkg/errs"
 	"github.com/tikv/pd/server/cluster"
 	"github.com/tikv/pd/server/core"
 	"go.uber.org/zap"
@@ -404,7 +405,7 @@ func (s *Server) RegionHeartbeat(stream pdpb.PD_RegionHeartbeatServer) error {
 
 		region := core.RegionFromHeartbeat(request)
 		if region.GetLeader() == nil {
-			log.Error("invalid request, the leader is nil", zap.Reflect("reqeust", request))
+			log.Error("invalid request, the leader is nil", zap.Reflect("request", request), errs.ZapError(errs.ErrLeaderNil))
 			continue
 		}
 		if region.GetID() == 0 {

server/heartbeat_streams.go

@@ -88,15 +88,15 @@ func (s *heartbeatStreams) run() {
 			if store == nil {
 				log.Error("failed to get store",
 					zap.Uint64("region-id", msg.RegionId),
-					zap.Uint64("store-id", storeID))
+					zap.Uint64("store-id", storeID), errs.ZapError(errs.ErrGetSourceStore))
 				delete(s.streams, storeID)
 				continue
 			}
 			storeAddress := store.GetAddress()
 			if stream, ok := s.streams[storeID]; ok {
 				if err := stream.Send(msg); err != nil {
 					log.Error("send heartbeat message fail",
-						zap.Uint64("region-id", msg.RegionId), zap.Error(err))
+						zap.Uint64("region-id", msg.RegionId), errs.ZapError(errs.ErrGRPCSend.Wrap(err).GenWithStackByArgs()))
 					delete(s.streams, storeID)
 					regionHeartbeatCounter.WithLabelValues(storeAddress, storeLabel, "push", "err").Inc()
 				} else {
@@ -112,7 +112,7 @@ func (s *heartbeatStreams) run() {
 			for storeID, stream := range s.streams {
 				store := s.cluster.GetStore(storeID)
 				if store == nil {
-					log.Error("failed to get store", zap.Uint64("store-id", storeID))
+					log.Error("failed to get store", zap.Uint64("store-id", storeID), errs.ZapError(errs.ErrGetSourceStore))
 					delete(s.streams, storeID)
 					continue
 				}

server/id/id.go

@@ -17,8 +17,8 @@ import (
 	"path"
 	"sync"
 
-	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
+	"github.com/tikv/pd/pkg/errs"
 	"github.com/tikv/pd/pkg/etcdutil"
 	"github.com/tikv/pd/pkg/typeutil"
 	"github.com/tikv/pd/server/kv"
@@ -101,10 +101,10 @@ func (alloc *AllocatorImpl) generate() (uint64, error) {
 	t := txn.If(append([]clientv3.Cmp{cmp}, clientv3.Compare(clientv3.Value(leaderPath), "=", alloc.member))...)
 	resp, err := t.Then(clientv3.OpPut(key, string(value))).Commit()
 	if err != nil {
-		return 0, err
+		return 0, errs.ErrEtcdTxn.Wrap(err).GenWithStackByArgs()
 	}
 	if !resp.Succeeded {
-		return 0, errors.New("generate id failed, we may not leader")
+		return 0, errs.ErrEtcdTxn.FastGenByArgs()
 	}
 
 	log.Info("idAllocator allocates a new id", zap.Uint64("alloc-id", end))

server/kv/etcd_kv.go

@@ -55,7 +55,7 @@ func (kv *etcdKVBase) Load(key string) (string, error) {
 	if n := len(resp.Kvs); n == 0 {
 		return "", nil
 	} else if n > 1 {
-		return "", errors.Errorf("load more than one kvs: key %v kvs %v", key, n)
+		return "", errs.ErrEtcdKVGetResponse.GenWithStackByArgs(resp.Kvs)
 	}
 	return string(resp.Kvs[0].Value), nil
 }

server/member/lease.go

@@ -18,7 +18,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
 	"github.com/tikv/pd/pkg/errs"
 	"go.etcd.io/etcd/clientv3"
@@ -50,7 +49,7 @@ func (l *LeaderLease) Grant(leaseTimeout int64) error {
 	leaseResp, err := l.lease.Grant(ctx, leaseTimeout)
 	cancel()
 	if err != nil {
-		return errors.WithStack(err)
+		return errs.ErrEtcdGrantLease.Wrap(err).GenWithStackByCause()
 	}
 	if cost := time.Since(start); cost > slowRequestTime {
 		log.Warn("lease grants too slow", zap.Duration("cost", cost))