From c0dcacb06d4412ac66f9683f1724aa792b11c9f7 Mon Sep 17 00:00:00 2001 From: tzwang Date: Wed, 24 Apr 2024 17:23:43 +0800 Subject: [PATCH 1/7] added getAiJobLog apis Former-commit-id: 5379463930bfd5ef70797e1271880a2d8c3e8516 --- api/desc/pcm.api | 3 +++ api/desc/schedule/pcm-schedule.api | 9 +++++++++ .../scheduler/service/collector/collector.go | 1 + api/internal/storeLink/modelarts.go | 4 ++++ api/internal/storeLink/octopus.go | 19 +++++++++++++++++++ api/internal/storeLink/shuguangai.go | 18 ++++++++++++++++++ go.mod | 4 ++-- go.sum | 5 +++++ 8 files changed, 61 insertions(+), 2 deletions(-) diff --git a/api/desc/pcm.api b/api/desc/pcm.api index 2c76692c..cf485b54 100644 --- a/api/desc/pcm.api +++ b/api/desc/pcm.api @@ -922,6 +922,9 @@ service pcm { @handler ScheduleGetAlgorithmsHandler get /schedule/ai/getAlgorithms/:adapterId/:resourceType/:taskType/:dataset (AiAlgorithmsReq) returns (AiAlgorithmsResp) + @handler ScheduleGetAiJobLogLogHandler + get /schedule/ai/getJobLog/:taskId/:instanceNum (AiJobLogReq) returns (AiJobLogResp) + @handler ScheduleSubmitHandler post /schedule/submit (ScheduleReq) returns (ScheduleResp) } diff --git a/api/desc/schedule/pcm-schedule.api b/api/desc/schedule/pcm-schedule.api index 3eccf3e5..d3d61990 100644 --- a/api/desc/schedule/pcm-schedule.api +++ b/api/desc/schedule/pcm-schedule.api @@ -70,4 +70,13 @@ type ( AiAlgorithmsResp { Algorithms []string `json:"algorithms"` } + + AiJobLogReq { + TaskId string `path:"taskId"` + instanceNum string `path:"instanceNum"` + } + + AiJobLogResp { + Log string `json:"log"` + } ) \ No newline at end of file diff --git a/api/internal/scheduler/service/collector/collector.go b/api/internal/scheduler/service/collector/collector.go index a20b1d36..e313baff 100644 --- a/api/internal/scheduler/service/collector/collector.go +++ b/api/internal/scheduler/service/collector/collector.go @@ -6,6 +6,7 @@ type AiCollector interface { GetResourceStats(ctx context.Context) (*ResourceStats, error) GetDatasetsSpecs(ctx context.Context) ([]*DatasetsSpecs, error) GetAlgorithms(ctx context.Context) ([]*Algorithm, error) + GetTrainingTaskLog(ctx context.Context, taskId string, instanceNum string) (string, error) } type ResourceStats struct { diff --git a/api/internal/storeLink/modelarts.go b/api/internal/storeLink/modelarts.go index 6dffc2ec..5a9bed87 100644 --- a/api/internal/storeLink/modelarts.go +++ b/api/internal/storeLink/modelarts.go @@ -162,6 +162,10 @@ func (m *ModelArtsLink) GetAlgorithms(ctx context.Context) ([]*collector.Algorit return nil, nil } +func (m *ModelArtsLink) GetTrainingTaskLog(ctx context.Context, taskId string, instanceNum string) (string, error) { + return "", nil +} + func (m *ModelArtsLink) Execute(ctx context.Context, option *option.AiOption) (interface{}, error) { err := m.GenerateSubmitParams(ctx, option) if err != nil { diff --git a/api/internal/storeLink/octopus.go b/api/internal/storeLink/octopus.go index b643c1d6..e052f637 100644 --- a/api/internal/storeLink/octopus.go +++ b/api/internal/storeLink/octopus.go @@ -337,6 +337,25 @@ func (o *OctopusLink) GetAlgorithms(ctx context.Context) ([]*collector.Algorithm return algorithms, nil } +func (o *OctopusLink) GetTrainingTaskLog(ctx context.Context, taskId string, instanceNum string) (string, error) { + instance, err := strconv.ParseInt(instanceNum, 10, 32) + if err != nil { + return "", err + } + req := &octopus.GetTrainJobLogReq{ + Platform: o.platform, + TaskId: taskId, + TaskNum: "task0", + Num: int32(instance), + } + resp, err := o.octopusRpc.GetTrainJobLog(ctx, req) + if err != nil { + return "", err + } + + return resp.Content, nil +} + func (o *OctopusLink) Execute(ctx context.Context, option *option.AiOption) (interface{}, error) { err := o.GenerateSubmitParams(ctx, option) if err != nil { diff --git a/api/internal/storeLink/shuguangai.go b/api/internal/storeLink/shuguangai.go index 53f9bf52..b07c3401 100644 --- a/api/internal/storeLink/shuguangai.go +++ b/api/internal/storeLink/shuguangai.go @@ -447,6 +447,24 @@ func (s *ShuguangAi) GetAlgorithms(ctx context.Context) ([]*collector.Algorithm, return algorithms, nil } +func (s *ShuguangAi) GetTrainingTaskLog(ctx context.Context, taskId string, instanceNum string) (string, error) { + req := &hpcAC.GetInstanceLogReq{ + TaskId: taskId, + InstanceNum: instanceNum, + LineCount: 1000, + StartLineNum: -1, + } + resp, err := s.aCRpc.GetInstanceLog(ctx, req) + if err != nil { + return "", err + } + if resp.Code != "0" { + return "", errors.New(resp.Msg) + } + + return resp.Data.Content, nil +} + func (s *ShuguangAi) Execute(ctx context.Context, option *option.AiOption) (interface{}, error) { err := s.GenerateSubmitParams(ctx, option) if err != nil { diff --git a/go.mod b/go.mod index 03670445..a46abb60 100644 --- a/go.mod +++ b/go.mod @@ -24,9 +24,9 @@ require ( github.com/robfig/cron/v3 v3.0.1 github.com/rs/zerolog v1.28.0 github.com/zeromicro/go-zero v1.6.3 - gitlink.org.cn/JointCloud/pcm-ac v0.0.0-20240407112649-e479e74b58c8 + gitlink.org.cn/JointCloud/pcm-ac v0.0.0-20240420083915-58d6e2958aeb gitlink.org.cn/JointCloud/pcm-kubernetes v0.0.0-20240301071143-347480abff2c - gitlink.org.cn/JointCloud/pcm-octopus v0.0.0-20240407105727-38e45468eaa8 + gitlink.org.cn/JointCloud/pcm-octopus v0.0.0-20240424085753-6899615e9142 gitlink.org.cn/JointCloud/pcm-openstack v0.0.0-20240403033338-e7edabad4203 gitlink.org.cn/JointCloud/pcm-slurm v0.0.0-20240301080743-8b94bbaf57f5 gitlink.org.cn/jcce-pcm/pcm-participant-ceph v0.0.0-20230904090036-24fc730ec87d diff --git a/go.sum b/go.sum index cdd78495..31133cce 100644 --- a/go.sum +++ b/go.sum @@ -1080,10 +1080,15 @@ github.com/zeromicro/go-zero v1.6.3 h1:OL0NnHD5LdRNDolfcK9vUkJt7K8TcBE3RkzfM8poO github.com/zeromicro/go-zero v1.6.3/go.mod h1:XZL435ZxVi9MSXXtw2MRQhHgx6OoX3++MRMOE9xU70c= gitlink.org.cn/JointCloud/pcm-ac v0.0.0-20240407112649-e479e74b58c8 h1:cX6U2gUcp/sIP3TKFv4q/1O8gp10q+M3k5Ql15yaEMI= gitlink.org.cn/JointCloud/pcm-ac v0.0.0-20240407112649-e479e74b58c8/go.mod h1:w3Nb5TNymCItQ7K3x4Q0JLuoq9OerwAzAWT2zsPE9Xo= +gitlink.org.cn/JointCloud/pcm-ac v0.0.0-20240420083915-58d6e2958aeb h1:k6mNEWKp+haQUaK2dWs/rI9OKgzJHY1/9KNKuBDN0Vw= +gitlink.org.cn/JointCloud/pcm-ac v0.0.0-20240420083915-58d6e2958aeb/go.mod h1:w3Nb5TNymCItQ7K3x4Q0JLuoq9OerwAzAWT2zsPE9Xo= gitlink.org.cn/JointCloud/pcm-kubernetes v0.0.0-20240301071143-347480abff2c h1:2Wl/hvaSFjh6fmCSIQhjkr9llMRREQeqcXNLZ/HPY18= gitlink.org.cn/JointCloud/pcm-kubernetes v0.0.0-20240301071143-347480abff2c/go.mod h1:lSRfGs+PxFvw7CcndHWRd6UlLlGrZn0b0hp5cfaMNGw= gitlink.org.cn/JointCloud/pcm-octopus v0.0.0-20240407105727-38e45468eaa8 h1:jdwYydJxYPlfIS9yZvnNX1w08aJGYWq5ADD5EXLW3+Q= gitlink.org.cn/JointCloud/pcm-octopus v0.0.0-20240407105727-38e45468eaa8/go.mod h1:QOD5+/l2D+AYBjF2h5T0mdJyfGAmF78QmeKdbBXbjLQ= +gitlink.org.cn/JointCloud/pcm-octopus v0.0.0-20240422093351-5b8bac8bb953 h1:45omfrELx1Ealvs20NwFgdubCUnTyiatBAQyUwG6aAk= +gitlink.org.cn/JointCloud/pcm-octopus v0.0.0-20240422093351-5b8bac8bb953/go.mod h1:QOD5+/l2D+AYBjF2h5T0mdJyfGAmF78QmeKdbBXbjLQ= +gitlink.org.cn/JointCloud/pcm-octopus v0.0.0-20240424085753-6899615e9142/go.mod h1:QOD5+/l2D+AYBjF2h5T0mdJyfGAmF78QmeKdbBXbjLQ= gitlink.org.cn/JointCloud/pcm-openstack v0.0.0-20240403033338-e7edabad4203 h1:s6PsZ1+bev294IWdZRlV7mnOwI1+UzFcldVW/BqhQzI= gitlink.org.cn/JointCloud/pcm-openstack v0.0.0-20240403033338-e7edabad4203/go.mod h1:i2rrbMQ+Fve345BY9Heh4MUqVTAimZQElQhzzRee5B8= gitlink.org.cn/JointCloud/pcm-slurm v0.0.0-20240301080743-8b94bbaf57f5 h1:+/5vnzkJBfMRnya1NrhOzlroUtRa5ePiYbPKlHLoLV0= From 189c833f5da3e8c8097ea58cc4f4fda261a29895 Mon Sep 17 00:00:00 2001 From: tzwang Date: Thu, 25 Apr 2024 16:03:13 +0800 Subject: [PATCH 2/7] generate getJobLog api Former-commit-id: cf3cfd9b6f4ced4a41800863238490a797964c65 --- api/internal/handler/routes.go | 5 +++++ api/internal/types/types.go | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/api/internal/handler/routes.go b/api/internal/handler/routes.go index a68efc58..0138989a 100644 --- a/api/internal/handler/routes.go +++ b/api/internal/handler/routes.go @@ -1145,6 +1145,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { Path: "/schedule/ai/getAlgorithms/:adapterId/:resourceType/:taskType/:dataset", Handler: schedule.ScheduleGetAlgorithmsHandler(serverCtx), }, + { + Method: http.MethodGet, + Path: "/schedule/ai/getJobLog/:taskId/:instanceNum", + Handler: schedule.ScheduleGetAiJobLogLogHandler(serverCtx), + }, { Method: http.MethodPost, Path: "/schedule/submit", diff --git a/api/internal/types/types.go b/api/internal/types/types.go index 59dd185d..53285b9b 100644 --- a/api/internal/types/types.go +++ b/api/internal/types/types.go @@ -5535,6 +5535,15 @@ type AiAlgorithmsResp struct { Algorithms []string `json:"algorithms"` } +type AiJobLogReq struct { + TaskId string `path:"taskId"` + InstanceNum string `path:"instanceNum"` +} + +type AiJobLogResp struct { + Log string `json:"log"` +} + type CreateAlertRuleReq struct { CLusterId string `json:"clusterId"` ClusterName string `json:"clusterName"` From 1281f6d61b80f7686b4f9e141b7cf173d36a8b8b Mon Sep 17 00:00:00 2001 From: tzwang Date: Thu, 25 Apr 2024 16:04:22 +0800 Subject: [PATCH 3/7] generate getJobLog api Former-commit-id: 922c4149bb05dbe2b0881db2fd3e2646f5cb0d08 --- .../schedule/schedulegetaijoblogloglogic.go | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 api/internal/logic/schedule/schedulegetaijoblogloglogic.go diff --git a/api/internal/logic/schedule/schedulegetaijoblogloglogic.go b/api/internal/logic/schedule/schedulegetaijoblogloglogic.go new file mode 100644 index 00000000..e2bb9e5c --- /dev/null +++ b/api/internal/logic/schedule/schedulegetaijoblogloglogic.go @@ -0,0 +1,30 @@ +package schedule + +import ( + "context" + + "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" + "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" + + "github.com/zeromicro/go-zero/core/logx" +) + +type ScheduleGetAiJobLogLogLogic struct { + logx.Logger + ctx context.Context + svcCtx *svc.ServiceContext +} + +func NewScheduleGetAiJobLogLogLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ScheduleGetAiJobLogLogLogic { + return &ScheduleGetAiJobLogLogLogic{ + Logger: logx.WithContext(ctx), + ctx: ctx, + svcCtx: svcCtx, + } +} + +func (l *ScheduleGetAiJobLogLogLogic) ScheduleGetAiJobLogLog(req *types.AiJobLogReq) (resp *types.AiJobLogResp, err error) { + // todo: add your logic here and delete this line + + return +} From f3ce064dae88bba7f35416d6d61e186954dc3234 Mon Sep 17 00:00:00 2001 From: tzwang Date: Thu, 25 Apr 2024 16:51:59 +0800 Subject: [PATCH 4/7] updated getJobLog api logic Former-commit-id: ff312781e1ec873ab7a6637cead3f466809cd001 --- api/desc/pcm.api | 2 +- api/desc/schedule/pcm-schedule.api | 2 ++ api/internal/handler/routes.go | 2 +- .../logic/schedule/schedulegetaijoblogloglogic.go | 10 ++++++++-- api/internal/types/types.go | 2 ++ 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/api/desc/pcm.api b/api/desc/pcm.api index cf485b54..26baa9c8 100644 --- a/api/desc/pcm.api +++ b/api/desc/pcm.api @@ -923,7 +923,7 @@ service pcm { get /schedule/ai/getAlgorithms/:adapterId/:resourceType/:taskType/:dataset (AiAlgorithmsReq) returns (AiAlgorithmsResp) @handler ScheduleGetAiJobLogLogHandler - get /schedule/ai/getJobLog/:taskId/:instanceNum (AiJobLogReq) returns (AiJobLogResp) + get /schedule/ai/getJobLog/:adapterId/:taskId/:instanceNum (AiJobLogReq) returns (AiJobLogResp) @handler ScheduleSubmitHandler post /schedule/submit (ScheduleReq) returns (ScheduleResp) diff --git a/api/desc/schedule/pcm-schedule.api b/api/desc/schedule/pcm-schedule.api index d3d61990..02783746 100644 --- a/api/desc/schedule/pcm-schedule.api +++ b/api/desc/schedule/pcm-schedule.api @@ -72,6 +72,8 @@ type ( } AiJobLogReq { + AdapterId string `path:"adapterId"` + ClusterId string `path:"clusterId"` TaskId string `path:"taskId"` instanceNum string `path:"instanceNum"` } diff --git a/api/internal/handler/routes.go b/api/internal/handler/routes.go index 0138989a..a3ade3e1 100644 --- a/api/internal/handler/routes.go +++ b/api/internal/handler/routes.go @@ -1147,7 +1147,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { }, { Method: http.MethodGet, - Path: "/schedule/ai/getJobLog/:taskId/:instanceNum", + Path: "/schedule/ai/getJobLog/:adapterId/:taskId/:instanceNum", Handler: schedule.ScheduleGetAiJobLogLogHandler(serverCtx), }, { diff --git a/api/internal/logic/schedule/schedulegetaijoblogloglogic.go b/api/internal/logic/schedule/schedulegetaijoblogloglogic.go index e2bb9e5c..da5a0c7a 100644 --- a/api/internal/logic/schedule/schedulegetaijoblogloglogic.go +++ b/api/internal/logic/schedule/schedulegetaijoblogloglogic.go @@ -24,7 +24,13 @@ func NewScheduleGetAiJobLogLogLogic(ctx context.Context, svcCtx *svc.ServiceCont } func (l *ScheduleGetAiJobLogLogLogic) ScheduleGetAiJobLogLog(req *types.AiJobLogReq) (resp *types.AiJobLogResp, err error) { - // todo: add your logic here and delete this line + resp = &types.AiJobLogResp{} - return + log, err := l.svcCtx.Scheduler.AiService.AiCollectorAdapterMap[req.AdapterId][req.ClusterId].GetTrainingTaskLog(l.ctx, req.TaskId, req.InstanceNum) + if err != nil { + return nil, err + } + + resp.Log = log + return resp, nil } diff --git a/api/internal/types/types.go b/api/internal/types/types.go index 53285b9b..52164d6e 100644 --- a/api/internal/types/types.go +++ b/api/internal/types/types.go @@ -5536,6 +5536,8 @@ type AiAlgorithmsResp struct { } type AiJobLogReq struct { + AdapterId string `path:"adapterId"` + ClusterId string `path:"clusterId"` TaskId string `path:"taskId"` InstanceNum string `path:"instanceNum"` } From b919452c437893e7beec85b9e7ca7769e0a4ddf3 Mon Sep 17 00:00:00 2001 From: tzwang Date: Thu, 25 Apr 2024 18:08:11 +0800 Subject: [PATCH 5/7] added getJobLog api handler Former-commit-id: d03433d970f407855b183f46bdeebc9cabddfda6 --- .../schedule/schedulegetaijoblogloghandler.go | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 api/internal/handler/schedule/schedulegetaijoblogloghandler.go diff --git a/api/internal/handler/schedule/schedulegetaijoblogloghandler.go b/api/internal/handler/schedule/schedulegetaijoblogloghandler.go new file mode 100644 index 00000000..9eecc66d --- /dev/null +++ b/api/internal/handler/schedule/schedulegetaijoblogloghandler.go @@ -0,0 +1,28 @@ +package schedule + +import ( + "net/http" + + "github.com/zeromicro/go-zero/rest/httpx" + "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/logic/schedule" + "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" + "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" +) + +func ScheduleGetAiJobLogLogHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var req types.AiJobLogReq + if err := httpx.Parse(r, &req); err != nil { + httpx.ErrorCtx(r.Context(), w, err) + return + } + + l := schedule.NewScheduleGetAiJobLogLogLogic(r.Context(), svcCtx) + resp, err := l.ScheduleGetAiJobLogLog(&req) + if err != nil { + httpx.ErrorCtx(r.Context(), w, err) + } else { + httpx.OkJsonCtx(r.Context(), w, resp) + } + } +} From 10c719fc01eca23538c2fc4ba6a4b1dad488050f Mon Sep 17 00:00:00 2001 From: tzwang Date: Thu, 25 Apr 2024 18:28:30 +0800 Subject: [PATCH 6/7] updated getAiJobLog handler Former-commit-id: caaa3466f447309bf339b31ad8cf3323ffd9f9b1 --- api/desc/pcm.api | 2 +- api/internal/svc/servicecontext.go | 4 ---- go.sum | 7 +------ 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/api/desc/pcm.api b/api/desc/pcm.api index 26baa9c8..12d338a0 100644 --- a/api/desc/pcm.api +++ b/api/desc/pcm.api @@ -923,7 +923,7 @@ service pcm { get /schedule/ai/getAlgorithms/:adapterId/:resourceType/:taskType/:dataset (AiAlgorithmsReq) returns (AiAlgorithmsResp) @handler ScheduleGetAiJobLogLogHandler - get /schedule/ai/getJobLog/:adapterId/:taskId/:instanceNum (AiJobLogReq) returns (AiJobLogResp) + get /schedule/ai/getJobLog/:adapterId/:clusterId/:taskId/:instanceNum (AiJobLogReq) returns (AiJobLogResp) @handler ScheduleSubmitHandler post /schedule/submit (ScheduleReq) returns (ScheduleResp) diff --git a/api/internal/svc/servicecontext.go b/api/internal/svc/servicecontext.go index 0c73eb17..1aca2ac4 100644 --- a/api/internal/svc/servicecontext.go +++ b/api/internal/svc/servicecontext.go @@ -117,10 +117,6 @@ func NewServiceContext(c config.Config) *ServiceContext { }) // scheduler - //octopusRpc := octopusclient.NewOctopus(zrpc.MustNewClient(c.OctopusRpcConf)) - //aCRpc := hpcacclient.NewHpcAC(zrpc.MustNewClient(c.ACRpcConf)) - //modelArtsRpc := modelartsservice.NewModelArtsService(zrpc.MustNewClient(c.ModelArtsRpcConf)) - //modelArtsImgRpc := imagesservice.NewImagesService(zrpc.MustNewClient(c.ModelArtsImgRpcConf)) storage := &database.AiStorage{DbEngin: dbEngin} aiService, err := service.NewAiService(&c, storage) if err != nil { diff --git a/go.sum b/go.sum index 31133cce..6f886672 100644 --- a/go.sum +++ b/go.sum @@ -1078,16 +1078,11 @@ github.com/yuin/gopher-lua v1.1.0/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7 github.com/zeromicro/go-zero v1.5.1/go.mod h1:bGYm4XWsGN9GhDsO2O2BngpVoWjf3Eog2a5hUOMhlXs= github.com/zeromicro/go-zero v1.6.3 h1:OL0NnHD5LdRNDolfcK9vUkJt7K8TcBE3RkzfM8poOVw= github.com/zeromicro/go-zero v1.6.3/go.mod h1:XZL435ZxVi9MSXXtw2MRQhHgx6OoX3++MRMOE9xU70c= -gitlink.org.cn/JointCloud/pcm-ac v0.0.0-20240407112649-e479e74b58c8 h1:cX6U2gUcp/sIP3TKFv4q/1O8gp10q+M3k5Ql15yaEMI= -gitlink.org.cn/JointCloud/pcm-ac v0.0.0-20240407112649-e479e74b58c8/go.mod h1:w3Nb5TNymCItQ7K3x4Q0JLuoq9OerwAzAWT2zsPE9Xo= gitlink.org.cn/JointCloud/pcm-ac v0.0.0-20240420083915-58d6e2958aeb h1:k6mNEWKp+haQUaK2dWs/rI9OKgzJHY1/9KNKuBDN0Vw= gitlink.org.cn/JointCloud/pcm-ac v0.0.0-20240420083915-58d6e2958aeb/go.mod h1:w3Nb5TNymCItQ7K3x4Q0JLuoq9OerwAzAWT2zsPE9Xo= gitlink.org.cn/JointCloud/pcm-kubernetes v0.0.0-20240301071143-347480abff2c h1:2Wl/hvaSFjh6fmCSIQhjkr9llMRREQeqcXNLZ/HPY18= gitlink.org.cn/JointCloud/pcm-kubernetes v0.0.0-20240301071143-347480abff2c/go.mod h1:lSRfGs+PxFvw7CcndHWRd6UlLlGrZn0b0hp5cfaMNGw= -gitlink.org.cn/JointCloud/pcm-octopus v0.0.0-20240407105727-38e45468eaa8 h1:jdwYydJxYPlfIS9yZvnNX1w08aJGYWq5ADD5EXLW3+Q= -gitlink.org.cn/JointCloud/pcm-octopus v0.0.0-20240407105727-38e45468eaa8/go.mod h1:QOD5+/l2D+AYBjF2h5T0mdJyfGAmF78QmeKdbBXbjLQ= -gitlink.org.cn/JointCloud/pcm-octopus v0.0.0-20240422093351-5b8bac8bb953 h1:45omfrELx1Ealvs20NwFgdubCUnTyiatBAQyUwG6aAk= -gitlink.org.cn/JointCloud/pcm-octopus v0.0.0-20240422093351-5b8bac8bb953/go.mod h1:QOD5+/l2D+AYBjF2h5T0mdJyfGAmF78QmeKdbBXbjLQ= +gitlink.org.cn/JointCloud/pcm-octopus v0.0.0-20240424085753-6899615e9142 h1:+po0nesBDSWsgCySBG7eEXk7i9Ytd58wqvjL1M9y6d8= gitlink.org.cn/JointCloud/pcm-octopus v0.0.0-20240424085753-6899615e9142/go.mod h1:QOD5+/l2D+AYBjF2h5T0mdJyfGAmF78QmeKdbBXbjLQ= gitlink.org.cn/JointCloud/pcm-openstack v0.0.0-20240403033338-e7edabad4203 h1:s6PsZ1+bev294IWdZRlV7mnOwI1+UzFcldVW/BqhQzI= gitlink.org.cn/JointCloud/pcm-openstack v0.0.0-20240403033338-e7edabad4203/go.mod h1:i2rrbMQ+Fve345BY9Heh4MUqVTAimZQElQhzzRee5B8= From f0a707689c1e2a96b2a3562dcec9ec797c7aedae Mon Sep 17 00:00:00 2001 From: tzwang Date: Fri, 26 Apr 2024 10:38:49 +0800 Subject: [PATCH 7/7] updated getJobLog api Former-commit-id: 23ffca2a8dce387c765515b27628b7116f84ef51 --- api/internal/handler/routes.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/internal/handler/routes.go b/api/internal/handler/routes.go index a3ade3e1..5402a03d 100644 --- a/api/internal/handler/routes.go +++ b/api/internal/handler/routes.go @@ -1147,7 +1147,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { }, { Method: http.MethodGet, - Path: "/schedule/ai/getJobLog/:adapterId/:taskId/:instanceNum", + Path: "/schedule/ai/getJobLog/:adapterId/:clusterId/:taskId/:instanceNum", Handler: schedule.ScheduleGetAiJobLogLogHandler(serverCtx), }, {