Skip to content
This repository has been archived by the owner on Nov 24, 2023. It is now read-only.

Commit

Permalink
use err.Error() for msg
Browse files Browse the repository at this point in the history
  • Loading branch information
@GMHDBJD
GMHDBJD committed Jun 18, 2020
1 parent 28bb562 commit e78ee18
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 41 deletions.
2 changes: 1 addition & 1 deletion dm/command/argument.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func VerifySQLOperateArgs(binlogPosStr, sqlPattern string, sharding bool) (*mysq
if len(binlogPosStr) > 0 {
pos2, err := binlog.PositionFromStr(binlogPosStr)
if err != nil {
return nil, nil, terror.ErrVerifySQLOperateArgs.Generatef("invalid --binlog-pos %s in sql operation: %s", binlogPosStr, terror.Message(err))
return nil, nil, terror.ErrVerifySQLOperateArgs.Generatef("invalid --binlog-pos %s in sql operation: %v", binlogPosStr, err)
}
pos = &pos2
} else if len(sqlPattern) > 0 {
Expand Down
66 changes: 33 additions & 33 deletions dm/master/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ func (s *Server) RegisterWorker(ctx context.Context, req *pb.RegisterWorkerReque
if err != nil {
return &pb.RegisterWorkerResponse{
Result: false,
Msg: terror.Message(err),
Msg: err.Error(),
}, nil
}
log.L().Info("register worker successfully", zap.String("name", req.Name), zap.String("address", req.Address))
Expand Down Expand Up @@ -310,15 +310,15 @@ func (s *Server) OfflineMember(ctx context.Context, req *pb.OfflineMemberRequest
if err != nil {
return &pb.OfflineMemberResponse{
Result: false,
Msg: terror.Message(err),
Msg: err.Error(),
}, nil
}
} else if req.Type == common.Master {
err := s.deleteMasterByName(ctx, req.Name)
if err != nil {
return &pb.OfflineMemberResponse{
Result: false,
Msg: terror.Message(err),
Msg: err.Error(),
}, nil
}
} else {
Expand Down Expand Up @@ -383,7 +383,7 @@ func (s *Server) StartTask(ctx context.Context, req *pb.StartTaskRequest) (*pb.S
resp := &pb.StartTaskResponse{}
cfg, stCfgs, err := s.generateSubTask(ctx, req.Task)
if err != nil {
resp.Msg = terror.Message(err)
resp.Msg = err.Error()
return resp, nil
}
log.L().Info("", zap.String("task name", cfg.Name), zap.Stringer("task", cfg), zap.String("request", "StartTask"))
Expand Down Expand Up @@ -432,7 +432,7 @@ func (s *Server) StartTask(ctx context.Context, req *pb.StartTaskRequest) (*pb.S
err = s.scheduler.AddSubTasks(subtaskCfgPointersToInstances(stCfgs...)...)
s.removeMetaLock.Unlock()
if err != nil {
resp.Msg = terror.Message(err)
resp.Msg = err.Error()
return resp, nil
}
resp.Result = true
Expand Down Expand Up @@ -487,7 +487,7 @@ func (s *Server) OperateTask(ctx context.Context, req *pb.OperateTaskRequest) (*
err = s.scheduler.UpdateExpectSubTaskStage(expect, req.Name, sources...)
}
if err != nil {
resp.Msg = terror.Message(err)
resp.Msg = err.Error()
return resp, nil
}

Expand All @@ -513,7 +513,7 @@ func (s *Server) UpdateTask(ctx context.Context, req *pb.UpdateTaskRequest) (*pb
if err != nil {
return &pb.UpdateTaskResponse{
Result: false,
Msg: terror.Message(err),
Msg: err.Error(),
}, nil
}
log.L().Info("update task", zap.String("task name", cfg.Name), zap.Stringer("task", cfg))
Expand Down Expand Up @@ -753,7 +753,7 @@ func (s *Server) UnlockDDLLock(ctx context.Context, req *pb.UnlockDDLLockRequest
err := s.pessimist.UnlockLock(ctx, req.ID, req.ReplaceOwner, req.ForceRemove)
if err != nil {
resp.Result = false
resp.Msg = terror.Message(err)
resp.Msg = err.Error()
}

return resp, nil
Expand All @@ -777,7 +777,7 @@ func (s *Server) HandleSQLs(ctx context.Context, req *pb.HandleSQLsRequest) (*pb
if err != nil {
return &pb.HandleSQLsResponse{
Result: false,
Msg: fmt.Sprintf("save request with --sharding error:\n%s", terror.Message(err)),
Msg: fmt.Sprintf("save request with --sharding error:\n%v", err),
}, nil
}
log.L().Info("handle sqls request was saved", zap.String("task name", req.Name), zap.String("request", "HandleSQLs"))
Expand Down Expand Up @@ -816,7 +816,7 @@ func (s *Server) HandleSQLs(ctx context.Context, req *pb.HandleSQLsRequest) (*pb
response, err := worker.SendRequest(ctx, subReq, s.cfg.RPCTimeout)
workerResp := &pb.CommonWorkerResponse{}
if err != nil {
workerResp = errorCommonWorkerResponse(terror.Message(err), req.Source, worker.BaseInfo().Name)
workerResp = errorCommonWorkerResponse(err.Error(), req.Source, worker.BaseInfo().Name)
} else {
workerResp = response.HandleSubTaskSQLs
}
Expand Down Expand Up @@ -861,7 +861,7 @@ func (s *Server) PurgeWorkerRelay(ctx context.Context, req *pb.PurgeWorkerRelayR
resp, err := worker.SendRequest(ctx, workerReq, s.cfg.RPCTimeout)
workerResp := &pb.CommonWorkerResponse{}
if err != nil {
workerResp = errorCommonWorkerResponse(terror.Message(err), source, worker.BaseInfo().Name)
workerResp = errorCommonWorkerResponse(err.Error(), source, worker.BaseInfo().Name)
} else {
workerResp = resp.PurgeRelay
}
Expand Down Expand Up @@ -905,7 +905,7 @@ func (s *Server) SwitchWorkerRelayMaster(ctx context.Context, req *pb.SwitchWork

handleErr := func(err error, source string) {
log.L().Error("response error", zap.Error(err))
resp := errorCommonWorkerResponse(terror.Message(err), source, "")
resp := errorCommonWorkerResponse(err.Error(), source, "")
workerRespCh <- resp
}

Expand All @@ -928,7 +928,7 @@ func (s *Server) SwitchWorkerRelayMaster(ctx context.Context, req *pb.SwitchWork
resp, err := worker.SendRequest(ctx, request, s.cfg.RPCTimeout)
workerResp := &pb.CommonWorkerResponse{}
if err != nil {
workerResp = errorCommonWorkerResponse(terror.Message(err), sourceID, worker.BaseInfo().Name)
workerResp = errorCommonWorkerResponse(err.Error(), sourceID, worker.BaseInfo().Name)
} else {
workerResp = resp.SwitchRelayMaster
}
Expand Down Expand Up @@ -987,7 +987,7 @@ func (s *Server) OperateWorkerRelayTask(ctx context.Context, req *pb.OperateWork
}
err := s.scheduler.UpdateExpectRelayStage(expect, req.Sources...)
if err != nil {
resp.Msg = terror.Message(err)
resp.Msg = err.Error()
return resp, nil
}
resp.Result = true
Expand Down Expand Up @@ -1020,7 +1020,7 @@ func (s *Server) getStatusFromWorkers(ctx context.Context, sources []string, tas
log.L().Error("response error", zap.Error(err))
resp := &pb.QueryStatusResponse{
Result: false,
Msg: terror.Message(err),
Msg: err.Error(),
SourceStatus: &pb.SourceStatus{
Source: source,
},
Expand All @@ -1046,7 +1046,7 @@ func (s *Server) getStatusFromWorkers(ctx context.Context, sources []string, tas
if err != nil {
workerStatus = &pb.QueryStatusResponse{
Result: false,
Msg: terror.Message(err),
Msg: err.Error(),
SourceStatus: &pb.SourceStatus{},
}
} else {
Expand Down Expand Up @@ -1076,7 +1076,7 @@ func (s *Server) getErrorFromWorkers(ctx context.Context, sources []string, task
log.L().Error("response error", zap.Error(err))
resp := &pb.QueryErrorResponse{
Result: false,
Msg: terror.Message(err),
Msg: err.Error(),
SourceError: &pb.SourceError{
Source: source,
},
Expand All @@ -1103,7 +1103,7 @@ func (s *Server) getErrorFromWorkers(ctx context.Context, sources []string, task
if err != nil {
workerError = &pb.QueryErrorResponse{
Result: false,
Msg: terror.Message(err),
Msg: err.Error(),
SourceError: &pb.SourceError{},
}
} else {
Expand Down Expand Up @@ -1154,7 +1154,7 @@ func (s *Server) UpdateMasterConfig(ctx context.Context, req *pb.UpdateMasterCon
s.Unlock()
return &pb.UpdateMasterConfigResponse{
Result: false,
Msg: "Failed to write config to local file. detail: " + terror.Message(err),
Msg: "Failed to write config to local file. detail: " + err.Error(),
}, nil
}
log.L().Info("saved dm-master config file", zap.String("config file", s.cfg.ConfigFile), zap.String("request", "UpdateMasterConfig"))
Expand All @@ -1166,7 +1166,7 @@ func (s *Server) UpdateMasterConfig(ctx context.Context, req *pb.UpdateMasterCon
s.Unlock()
return &pb.UpdateMasterConfigResponse{
Result: false,
Msg: fmt.Sprintf("Failed to parse configure from file %s, detail: ", cfg.ConfigFile) + terror.Message(err),
Msg: fmt.Sprintf("Failed to parse configure from file %s, detail: ", cfg.ConfigFile) + err.Error(),
}, nil
}
log.L().Info("update dm-master config", zap.Stringer("config", cfg), zap.String("request", "UpdateMasterConfig"))
Expand Down Expand Up @@ -1205,7 +1205,7 @@ func (s *Server) UpdateWorkerRelayConfig(ctx context.Context, req *pb.UpdateWork
}
resp, err := worker.SendRequest(ctx, request, s.cfg.RPCTimeout)
if err != nil {
return errorCommonWorkerResponse(terror.Message(err), source, worker.BaseInfo().Name), nil
return errorCommonWorkerResponse(err.Error(), source, worker.BaseInfo().Name), nil
}
return resp.UpdateRelay, nil
}
Expand Down Expand Up @@ -1249,7 +1249,7 @@ func (s *Server) MigrateWorkerRelay(ctx context.Context, req *pb.MigrateWorkerRe
}
resp, err := worker.SendRequest(ctx, request, s.cfg.RPCTimeout)
if err != nil {
return errorCommonWorkerResponse(terror.Message(err), source, worker.BaseInfo().Name), nil
return errorCommonWorkerResponse(err.Error(), source, worker.BaseInfo().Name), nil
}
return resp.MigrateRelay, nil
}
Expand All @@ -1270,7 +1270,7 @@ func (s *Server) CheckTask(ctx context.Context, req *pb.CheckTaskRequest) (*pb.C
if err != nil {
return &pb.CheckTaskResponse{
Result: false,
Msg: terror.Message(err),
Msg: err.Error(),
}, nil
}

Expand Down Expand Up @@ -1317,15 +1317,15 @@ func (s *Server) OperateSource(ctx context.Context, req *pb.OperateSourceRequest
Result: false,
}
if err != nil {
resp.Msg = terror.Message(err)
resp.Msg = err.Error()
return resp, nil
}
var w *scheduler.Worker
switch req.Op {
case pb.SourceOp_StartSource:
err := s.scheduler.AddSourceCfg(*cfg)
if err != nil {
resp.Msg = terror.Message(err)
resp.Msg = err.Error()
return resp, nil
}
// for start source, we should get worker after start source
Expand All @@ -1338,7 +1338,7 @@ func (s *Server) OperateSource(ctx context.Context, req *pb.OperateSourceRequest
w = s.scheduler.GetWorkerBySource(cfg.SourceID)
err := s.scheduler.RemoveSourceCfg(cfg.SourceID)
if err != nil {
resp.Msg = terror.Message(err)
resp.Msg = err.Error()
return resp, nil
}
default:
Expand Down Expand Up @@ -1632,7 +1632,7 @@ func (s *Server) handleOperationResult(ctx context.Context, cli *scheduler.Worke
var response *pb.CommonWorkerResponse
queryResp, err := s.waitOperationOk(ctx, cli, taskName, sourceID, req)
if err != nil {
response = errorCommonWorkerResponse(terror.Message(err), sourceID, cli.BaseInfo().Name)
response = errorCommonWorkerResponse(err.Error(), sourceID, cli.BaseInfo().Name)
} else {
response = &pb.CommonWorkerResponse{
Result: true,
Expand Down Expand Up @@ -1699,7 +1699,7 @@ func (s *Server) listMemberMaster(ctx context.Context, names []string) (*pb.Memb

memberList, err := s.etcdClient.MemberList(ctx)
if err != nil {
resp.Master.Msg = terror.Message(err)
resp.Master.Msg = err.Error()
return resp, nil
}

Expand Down Expand Up @@ -1749,7 +1749,7 @@ func (s *Server) listMemberWorker(ctx context.Context, names []string) (*pb.Memb

workerAgents, err := s.scheduler.GetAllWorkers()
if err != nil {
resp.Worker.Msg = terror.Message(err)
resp.Worker.Msg = err.Error()
return resp, nil
}

Expand Down Expand Up @@ -1794,7 +1794,7 @@ func (s *Server) listMemberLeader(ctx context.Context, names []string) (*pb.Memb

_, name, addr, err := s.election.LeaderInfo(ctx)
if err != nil {
resp.Leader.Msg = terror.Message(err)
resp.Leader.Msg = err.Error()
return resp, nil
}

Expand Down Expand Up @@ -1831,7 +1831,7 @@ func (s *Server) ListMember(ctx context.Context, req *pb.ListMemberRequest) (*pb
if req.Leader {
res, err := s.listMemberLeader(ctx, req.Names)
if err != nil {
resp.Msg = terror.Message(err)
resp.Msg = err.Error()
return resp, nil
}
members = append(members, &pb.Members{
Expand All @@ -1842,7 +1842,7 @@ func (s *Server) ListMember(ctx context.Context, req *pb.ListMemberRequest) (*pb
if req.Master {
res, err := s.listMemberMaster(ctx, req.Names)
if err != nil {
resp.Msg = terror.Message(err)
resp.Msg = err.Error()
return resp, nil
}
members = append(members, &pb.Members{
Expand All @@ -1853,7 +1853,7 @@ func (s *Server) ListMember(ctx context.Context, req *pb.ListMemberRequest) (*pb
if req.Worker {
res, err := s.listMemberWorker(ctx, req.Names)
if err != nil {
resp.Msg = terror.Message(err)
resp.Msg = err.Error()
return resp, nil
}
members = append(members, &pb.Members{
Expand Down
5 changes: 2 additions & 3 deletions dm/tracer/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (
"sync"
"time"

"github.com/pingcap/errors"
"github.com/siddontang/go/sync2"
"github.com/soheilhy/cmux"
"go.uber.org/zap"
Expand Down Expand Up @@ -139,7 +138,7 @@ func (s *Server) UploadSyncerBinlogEvent(ctx context.Context, req *pb.UploadSync
if err != nil {
return &pb.CommonUploadResponse{
Result: false,
Msg: errors.ErrorStack(err),
Msg: err.Error(),
}, nil
}
}
Expand All @@ -157,7 +156,7 @@ func (s *Server) UploadSyncerJobEvent(ctx context.Context, req *pb.UploadSyncerJ
if err != nil {
return &pb.CommonUploadResponse{
Result: false,
Msg: errors.ErrorStack(err),
Msg: err.Error(),
}, nil
}
}
Expand Down
8 changes: 4 additions & 4 deletions dm/worker/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@ func (s *Server) OperateRelay(ctx context.Context, req *pb.OperateRelayRequest)
err := w.OperateRelay(ctx, req)
if err != nil {
log.L().Error("fail to operate relay", zap.String("request", "OperateRelay"), zap.Stringer("payload", req), zap.Error(err))
resp.Msg = errors.ErrorStack(err)
resp.Msg = err.Error()
return resp, nil
}

Expand Down Expand Up @@ -663,15 +663,15 @@ func (s *Server) QueryWorkerConfig(ctx context.Context, req *pb.QueryWorkerConfi
workerCfg, err := w.QueryConfig(ctx)
if err != nil {
resp.Result = false
resp.Msg = errors.ErrorStack(err)
resp.Msg = err.Error()
log.L().Error("fail to query worker config", zap.String("request", "QueryWorkerConfig"), zap.Stringer("payload", req), zap.Error(err))
return resp, nil
}

rawConfig, err := workerCfg.From.Toml()
if err != nil {
resp.Result = false
resp.Msg = errors.ErrorStack(err)
resp.Msg = err.Error()
log.L().Error("fail to marshal worker config", zap.String("request", "QueryWorkerConfig"), zap.Stringer("worker from config", &workerCfg.From), zap.Error(err))
}

Expand Down Expand Up @@ -808,7 +808,7 @@ func makeCommonWorkerResponse(reqErr error) *pb.CommonWorkerResponse {
}
if reqErr != nil {
resp.Result = false
resp.Msg = errors.ErrorStack(reqErr)
resp.Msg = reqErr.Error()
}
return resp
}
Expand Down

0 comments on commit e78ee18

Please sign in to comment.