From 997a0de27f4c3448e44b08f82643d81df2979cb4 Mon Sep 17 00:00:00 2001 From: tzwang Date: Thu, 11 Apr 2024 19:29:23 +0800 Subject: [PATCH] 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") }