From e12f80725e14c6c526b8a5c4a78a7bbe7c20cb90 Mon Sep 17 00:00:00 2001 From: tzwang Date: Sat, 11 May 2024 19:25:33 +0800 Subject: [PATCH] fix log bugs Former-commit-id: 92a183cafaea2973d5d0fe5c868537c9cd69e4b2 --- api/internal/logic/ai/getcentertasklistlogic.go | 2 +- api/internal/scheduler/schedulers/aiScheduler.go | 2 +- api/internal/storeLink/octopus.go | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/api/internal/logic/ai/getcentertasklistlogic.go b/api/internal/logic/ai/getcentertasklistlogic.go index edf3d1b4..2e63cf74 100644 --- a/api/internal/logic/ai/getcentertasklistlogic.go +++ b/api/internal/logic/ai/getcentertasklistlogic.go @@ -92,7 +92,7 @@ func (l *GetCenterTaskListLogic) updateAiTaskStatus(mu *sync.RWMutex, ch chan<- } for _, task := range taskList { t := task - if t.Status == constants.Completed { + if t.Status == constants.Completed || t.JobId == "" { continue } wg.Add(1) diff --git a/api/internal/scheduler/schedulers/aiScheduler.go b/api/internal/scheduler/schedulers/aiScheduler.go index b61e03b7..19f67b83 100644 --- a/api/internal/scheduler/schedulers/aiScheduler.go +++ b/api/internal/scheduler/schedulers/aiScheduler.go @@ -197,7 +197,7 @@ func (as *AiScheduler) AssignTask(clusters []*strategy.AssignedCluster) (interfa return nil, errors.New("database add failed: " + err.Error()) } } - for s := range ch { + for _, s := range results { if s.Msg != "" { msg := fmt.Sprintf("clusterId: %v , error: %v \n", s.ClusterId, s.Msg) errmsg += msg diff --git a/api/internal/storeLink/octopus.go b/api/internal/storeLink/octopus.go index 75f4ebef..b6c18161 100644 --- a/api/internal/storeLink/octopus.go +++ b/api/internal/storeLink/octopus.go @@ -471,6 +471,10 @@ func (o *OctopusLink) GetTrainingTaskLog(ctx context.Context, taskId string, ins return "", err } + if strings.Contains(resp.Content, "404 Not Found") { + resp.Content = "waiting for logs..." + } + return resp.Content, nil }