From 3d320d4ab06a58f0a2457eb3a0beb2e8d727273f Mon Sep 17 00:00:00 2001 From: tzwang Date: Thu, 11 Apr 2024 18:29:13 +0800 Subject: [PATCH 1/3] fix aiClusterMap bugs Former-commit-id: 9a2a5eb7bc32a4977149953a4c556743264e6c4a --- api/internal/scheduler/service/aiService.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/api/internal/scheduler/service/aiService.go b/api/internal/scheduler/service/aiService.go index aa8ded01..9fa480c7 100644 --- a/api/internal/scheduler/service/aiService.go +++ b/api/internal/scheduler/service/aiService.go @@ -28,18 +28,18 @@ func InitAiClusterMap(octopusRpc octopusclient.Octopus, modelArtsRpc modelartsse case OCTOPUS: id, _ := strconv.ParseInt(c.Id, 10, 64) octopus := storeLink.NewOctopusLink(octopusRpc, c.Nickname, id) - collectorMap[c.Nickname] = octopus - executorMap[c.Nickname] = octopus + collectorMap[c.Id] = octopus + executorMap[c.Id] = octopus case MODELARTS: id, _ := strconv.ParseInt(c.Id, 10, 64) modelarts := storeLink.NewModelArtsLink(modelArtsRpc, modelArtsImgRpc, c.Nickname, id) - collectorMap[c.Nickname] = modelarts - executorMap[c.Nickname] = modelarts + collectorMap[c.Id] = modelarts + executorMap[c.Id] = modelarts case SHUGUANGAI: id, _ := strconv.ParseInt(c.Id, 10, 64) sgai := storeLink.NewShuguangAi(aCRpc, c.Nickname, id) - collectorMap[c.Nickname] = sgai - executorMap[c.Nickname] = sgai + collectorMap[c.Id] = sgai + executorMap[c.Id] = sgai } } From 41c0ed784401ec025d4d114072951055252fe78b Mon Sep 17 00:00:00 2001 From: tzwang Date: Thu, 11 Apr 2024 07:21:04 -0400 Subject: [PATCH 2/3] updated scheduleResult api Former-commit-id: 13291220187c89f4eaa3f76068b46a870cbcdc32 --- api/desc/schedule/pcm-schedule.api | 1 + api/internal/types/types.go | 1 + 2 files changed, 2 insertions(+) diff --git a/api/desc/schedule/pcm-schedule.api b/api/desc/schedule/pcm-schedule.api index 8b6b2dd0..d3537c1c 100644 --- a/api/desc/schedule/pcm-schedule.api +++ b/api/desc/schedule/pcm-schedule.api @@ -19,6 +19,7 @@ type ( ScheduleResult { ClusterId string `json:"clusterId"` TaskId string `json:"taskId"` + Strategy string `json:"strategy"` Replica int32 `json:"replica"` Msg string `json:"msg"` } diff --git a/api/internal/types/types.go b/api/internal/types/types.go index 9fdcc9df..053c6d57 100644 --- a/api/internal/types/types.go +++ b/api/internal/types/types.go @@ -5289,6 +5289,7 @@ type ScheduleResp struct { type ScheduleResult struct { ClusterId string `json:"clusterId"` TaskId string `json:"taskId"` + Strategy string `json:"strategy"` Replica int32 `json:"replica"` Msg string `json:"msg"` } From 997a0de27f4c3448e44b08f82643d81df2979cb4 Mon Sep 17 00:00:00 2001 From: tzwang Date: Thu, 11 Apr 2024 19:29:23 +0800 Subject: [PATCH 3/3] fix aischeduler bugs Former-commit-id: bdf9f72c09b0abf0782c3ca11ef862e0379317fb --- api/internal/logic/schedule/schedulesubmitlogic.go | 1 + api/internal/scheduler/schedulers/aiScheduler.go | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/api/internal/logic/schedule/schedulesubmitlogic.go b/api/internal/logic/schedule/schedulesubmitlogic.go index c1f9e0f0..6d070d4d 100644 --- a/api/internal/logic/schedule/schedulesubmitlogic.go +++ b/api/internal/logic/schedule/schedulesubmitlogic.go @@ -55,6 +55,7 @@ func (l *ScheduleSubmitLogic) ScheduleSubmit(req *types.ScheduleReq) (resp *type scheResult := &types.ScheduleResult{} scheResult.ClusterId = r.ClusterId scheResult.TaskId = r.TaskId + scheResult.Strategy = r.Strategy scheResult.Replica = r.Replica scheResult.Msg = r.Msg resp.Results = append(resp.Results, scheResult) diff --git a/api/internal/scheduler/schedulers/aiScheduler.go b/api/internal/scheduler/schedulers/aiScheduler.go index 38a04a9d..80709f48 100644 --- a/api/internal/scheduler/schedulers/aiScheduler.go +++ b/api/internal/scheduler/schedulers/aiScheduler.go @@ -43,6 +43,7 @@ type AiScheduler struct { type AiResult struct { TaskId string ClusterId string + Strategy string Replica int32 Msg string } @@ -154,6 +155,7 @@ func (as *AiScheduler) AssignTask(clusters []*strategy.AssignedCluster) (interfa result, _ := convertType(resp) result.Replica = c.Replicas result.ClusterId = c.ClusterId + result.Strategy = as.option.StrategyName ch <- result wg.Done() @@ -167,7 +169,7 @@ func (as *AiScheduler) AssignTask(clusters []*strategy.AssignedCluster) (interfa errs = append(errs, e) } - if len(errs) != len(clusters) { + if len(errs) == len(clusters) { return nil, errors.New("submit task failed") }