Skip to content

Commit

Permalink
tools: bump golang.org/x/tools to v0.22.0 to fix panic on the mac os …
Browse files Browse the repository at this point in the history 
…sonoma (#11328)

close #11329
  • Loading branch information
@3AceShowHand
3AceShowHand authored Jun 20, 2024
1 parent 11ae941 commit 2de4633
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 28 deletions.
7 changes: 4 additions & 3 deletions dm/master/openapi_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ func (s *Server) getTask(ctx context.Context, taskName string, req openapi.DMAPI
}
task := config.SubTaskConfigsToOpenAPITask(subTaskConfigList)
if req.WithStatus != nil && *req.WithStatus {
subTaskStatusList, err := s.getTaskStatus(ctx, task.Name, openapi.DMAPIGetTaskStatusParams{})
subTaskStatusList, err := s.getTaskStatus(ctx, task.Name)
if err != nil {
return nil, err
}
Expand All @@ -511,7 +511,8 @@ func (s *Server) getTask(ctx context.Context, taskName string, req openapi.DMAPI
return task, nil
}

func (s *Server) getTaskStatus(ctx context.Context, taskName string, req openapi.DMAPIGetTaskStatusParams) ([]openapi.SubTaskStatus, error) {
func (s *Server) getTaskStatus(ctx context.Context, taskName string) ([]openapi.SubTaskStatus, error) {
req := openapi.DMAPIGetTaskStatusParams{}
if req.SourceNameList == nil || len(*req.SourceNameList) == 0 {
sourceNameList := openapi.SourceNameList(s.getTaskSourceNameList(taskName))
req.SourceNameList = &sourceNameList
Expand Down Expand Up @@ -627,7 +628,7 @@ func (s *Server) listTask(ctx context.Context, req openapi.DMAPIGetTaskListParam

if req.Stage != nil || (req.WithStatus != nil && *req.WithStatus) {
for idx := range taskList {
subTaskStatusList, err := s.getTaskStatus(ctx, taskList[idx].Name, openapi.DMAPIGetTaskStatusParams{})
subTaskStatusList, err := s.getTaskStatus(ctx, taskList[idx].Name)
if err != nil {
return taskArray, err
}
Expand Down
6 changes: 2 additions & 4 deletions dm/master/openapi_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,8 +336,7 @@ func (s *OpenAPIControllerSuite) TestTaskController() {

// get status
{
params := openapi.DMAPIGetTaskStatusParams{}
statusList, err := server.getTaskStatus(ctx, s.testTask.Name, params)
statusList, err := server.getTaskStatus(ctx, s.testTask.Name)
s.NoError(err)
s.Len(statusList, 1)
s.NotNil(statusList[0].ErrorMsg) // no worker, will get an error msg
Expand Down Expand Up @@ -524,8 +523,7 @@ func (s *OpenAPIControllerSuite) TestTaskControllerWithInvalidTask() {

// get status
{
params := openapi.DMAPIGetTaskStatusParams{}
statusList, err := server.getTaskStatus(ctx, task.Name, params)
statusList, err := server.getTaskStatus(ctx, task.Name)
s.NoError(err)
s.Len(statusList, 1)
s.NotNil(statusList[0].ErrorMsg)
Expand Down
23 changes: 11 additions & 12 deletions dm/master/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,26 +494,25 @@ func (s *Server) StartTask(ctx context.Context, req *pb.StartTaskRequest) (*pb.S
}

resp := &pb.StartTaskResponse{}
respWithErr := func(err error) (*pb.StartTaskResponse, error) {
respWithErr := func(err error) *pb.StartTaskResponse {
resp.Msg += err.Error()
// nolint:nilerr
return resp, nil
return resp
}

cliArgs := config.TaskCliArgs{
StartTime: req.StartTime,
}
if err := cliArgs.Verify(); err != nil {
return respWithErr(err)
return respWithErr(err), nil
}

cfg, stCfgs, err := s.generateSubTask(ctx, req.Task, &cliArgs)
if err != nil {
return respWithErr(err)
return respWithErr(err), nil
}
stCfgsForCheck, err := s.generateSubTasksForCheck(stCfgs)
if err != nil {
return respWithErr(err)
return respWithErr(err), nil
}
msg, err := checker.CheckSyncConfigFunc(ctx, stCfgsForCheck, ctlcommon.DefaultErrorCnt, ctlcommon.DefaultWarnCnt)
if err != nil {
Expand Down Expand Up @@ -562,35 +561,35 @@ func (s *Server) StartTask(ctx context.Context, req *pb.StartTaskRequest) (*pb.S
// use same latch for remove-meta and start-task
release, err3 = s.scheduler.AcquireSubtaskLatch(cfg.Name)
if err3 != nil {
return respWithErr(terror.ErrSchedulerLatchInUse.Generate("RemoveMeta", cfg.Name))
return respWithErr(terror.ErrSchedulerLatchInUse.Generate("RemoveMeta", cfg.Name)), nil
}
defer release()
latched = true

if scm := s.scheduler.GetSubTaskCfgsByTask(cfg.Name); len(scm) > 0 {
return respWithErr(terror.Annotate(terror.ErrSchedulerSubTaskExist.Generate(cfg.Name, sources),
"while remove-meta is true"))
"while remove-meta is true")), nil
}
err = s.removeMetaData(ctx, cfg.Name, cfg.MetaSchema, cfg.TargetDB)
if err != nil {
return respWithErr(terror.Annotate(err, "while removing metadata"))
return respWithErr(terror.Annotate(err, "while removing metadata")), nil
}
}

if req.StartTime == "" {
err = ha.DeleteAllTaskCliArgs(s.etcdClient, cfg.Name)
if err != nil {
return respWithErr(terror.Annotate(err, "while removing task command line arguments"))
return respWithErr(terror.Annotate(err, "while removing task command line arguments")), nil
}
} else {
err = ha.PutTaskCliArgs(s.etcdClient, cfg.Name, sources, cliArgs)
if err != nil {
return respWithErr(terror.Annotate(err, "while putting task command line arguments"))
return respWithErr(terror.Annotate(err, "while putting task command line arguments")), nil
}
}
err = s.scheduler.AddSubTasks(latched, pb.Stage_Running, subtaskCfgPointersToInstances(stCfgs...)...)
if err != nil {
return respWithErr(err)
return respWithErr(err), nil
}

if release != nil {
Expand Down
3 changes: 3 additions & 0 deletions engine/pkg/meta/mock/simple_mockclient.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ func (m *MetaMock) Delete(ctx context.Context, key string, opts ...metaModel.OpO
return m.deleteNoLock(ctx, key, opts...)
}

//nolint:unparam
func (m *MetaMock) deleteNoLock(_ context.Context, key string, _ ...metaModel.OpOption) (*metaModel.DeleteResponse, metaModel.Error) {
delete(m.store, key)
m.revision++
Expand All @@ -125,6 +126,7 @@ func (m *MetaMock) Put(ctx context.Context, key, value string) (*metaModel.PutRe
return m.putNoLock(ctx, key, value)
}

//nolint:unparam
func (m *MetaMock) putNoLock(_ context.Context, key, value string) (*metaModel.PutResponse, metaModel.Error) {
m.store[key] = value
m.revision++
Expand All @@ -143,6 +145,7 @@ func (m *MetaMock) Get(ctx context.Context, key string, opts ...metaModel.OpOpti
return m.getNoLock(ctx, key, opts...)
}

//nolint:unparam
func (m *MetaMock) getNoLock(_ context.Context, key string, _ ...metaModel.OpOption) (*metaModel.GetResponse, metaModel.Error) {
ret := &metaModel.GetResponse{
Header: &metaModel.ResponseHeader{
Expand Down
18 changes: 9 additions & 9 deletions tools/check/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ require (
github.com/tinylib/msgp v1.1.6
github.com/vektra/mockery/v2 v2.14.1
github.com/zhouqiang-cl/gocovmerge v0.0.0-20190125174600-5256314471af
golang.org/x/tools v0.7.0
golang.org/x/tools v0.22.0
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0
google.golang.org/protobuf v1.28.0
gotest.tools/gotestsum v1.8.1
Expand Down Expand Up @@ -95,7 +95,7 @@ require (
github.com/golangci/misspell v0.4.0 // indirect
github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 // indirect
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/renameio v1.0.1 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28 // indirect
Expand Down Expand Up @@ -209,15 +209,15 @@ require (
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/crypto v0.5.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
golang.org/x/exp/typeparams v0.0.0-20230224173230-c95f2b4c22f2 // indirect
golang.org/x/mod v0.9.0 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/term v0.6.0 // indirect
golang.org/x/text v0.8.0 // indirect
golang.org/x/mod v0.18.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/term v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
google.golang.org/genproto v0.0.0-20220719170305-83ca9fad585f // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
17 changes: 17 additions & 0 deletions tools/check/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,8 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
Expand Down Expand Up @@ -776,6 +778,8 @@ golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5y
golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
Expand Down Expand Up @@ -826,6 +830,8 @@ golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
Expand Down Expand Up @@ -873,6 +879,7 @@ golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand All @@ -897,6 +904,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
Expand Down Expand Up @@ -971,6 +980,8 @@ golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
Expand All @@ -983,6 +994,8 @@ golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
Expand All @@ -998,6 +1011,8 @@ golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
Expand Down Expand Up @@ -1092,6 +1107,8 @@ golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
Expand Down

0 comments on commit 2de4633

Please sign in to comment.