From 10456d0e5710ccfabd307a894fec9b3f7d1a746c Mon Sep 17 00:00:00 2001 From: jagger Date: Wed, 22 May 2024 10:01:57 +0800 Subject: [PATCH 1/5] fix bug Signed-off-by: jagger Former-commit-id: 7bdaf82a118554802ec5dad98f04a4267bd8d2a2 --- api/internal/scheduler/database/aiStorage.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/api/internal/scheduler/database/aiStorage.go b/api/internal/scheduler/database/aiStorage.go index 36a69364..8b0ad7ca 100644 --- a/api/internal/scheduler/database/aiStorage.go +++ b/api/internal/scheduler/database/aiStorage.go @@ -112,8 +112,6 @@ func (s *AiStorage) SaveAiTask(taskId int64, option *option.AiOption, clusterId return err } - del, _ := time.Parse(constants.Layout, constants.Layout) - aiTaskModel := models.TaskAi{ TaskId: taskId, AdapterId: aId, @@ -127,7 +125,6 @@ func (s *AiStorage) SaveAiTask(taskId int64, option *option.AiOption, clusterId Status: status, Msg: msg, Card: option.ComputeCard, - DeletedAt: del, CommitTime: time.Now(), } // 保存任务数据到数据库 From 705afead2bedb36229039fab836daf81a6f43294 Mon Sep 17 00:00:00 2001 From: tzwang Date: Wed, 22 May 2024 10:08:31 +0800 Subject: [PATCH 2/5] fix LOG bugs Former-commit-id: 71434c3bafcfa2653462acb43ed63e0dcb6a2ddf --- api/internal/storeLink/shuguangai.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/internal/storeLink/shuguangai.go b/api/internal/storeLink/shuguangai.go index 2aa2a68c..03cb8928 100644 --- a/api/internal/storeLink/shuguangai.go +++ b/api/internal/storeLink/shuguangai.go @@ -503,8 +503,9 @@ func (s *ShuguangAi) GetTrainingTaskLog(ctx context.Context, taskId string, inst if err != nil { return "", err } + if resp.Code != "0" { - return "", errors.New(resp.Msg) + resp.Data.Content = "waiting for logs..." } return resp.Data.Content, nil From f70207a2a4fcaef5716a4db11bf3378c2203fc9a Mon Sep 17 00:00:00 2001 From: jagger Date: Wed, 22 May 2024 11:41:56 +0800 Subject: [PATCH 3/5] fix bug Signed-off-by: jagger Former-commit-id: 489bb153b6c3d3798432231e68a63eb0cfdad39d --- pkg/models/taskaimodel_gen.go | 36 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pkg/models/taskaimodel_gen.go b/pkg/models/taskaimodel_gen.go index ab91d862..6b0e07bc 100644 --- a/pkg/models/taskaimodel_gen.go +++ b/pkg/models/taskaimodel_gen.go @@ -36,24 +36,24 @@ type ( } TaskAi struct { - Id int64 `db:"id"` // id - TaskId int64 `db:"task_id"` // 任务id - AdapterId int64 `db:"adapter_id"` // 适配器id - AdapterName string `db:"adapter_name"` // 适配器名称 - ClusterId int64 `db:"cluster_id"` // 集群id - ClusterName string `db:"cluster_name"` // 集群名称 - Name string `db:"name"` // 任务名 - Replica int64 `db:"replica"` // 执行数 - JobId string `db:"job_id"` // 集群返回任务id - Strategy string `db:"strategy"` // 主任务使用策略 - Status string `db:"status"` // 任务状态 - Msg string `db:"msg"` // 集群返回任务信息 - CommitTime time.Time `db:"commit_time"` // 提交时间 - StartTime string `db:"start_time"` // 开始时间 - EndTime string `db:"end_time"` // 结束时间 - TaskType string `db:"task_type"` - DeletedAt time.Time `db:"deleted_at"` - Card string `db:"card"` + Id int64 `db:"id"` // id + TaskId int64 `db:"task_id"` // 任务id + AdapterId int64 `db:"adapter_id"` // 适配器id + AdapterName string `db:"adapter_name"` // 适配器名称 + ClusterId int64 `db:"cluster_id"` // 集群id + ClusterName string `db:"cluster_name"` // 集群名称 + Name string `db:"name"` // 任务名 + Replica int64 `db:"replica"` // 执行数 + JobId string `db:"job_id"` // 集群返回任务id + Strategy string `db:"strategy"` // 主任务使用策略 + Status string `db:"status"` // 任务状态 + Msg string `db:"msg"` // 集群返回任务信息 + CommitTime time.Time `db:"commit_time"` // 提交时间 + StartTime string `db:"start_time"` // 开始时间 + EndTime string `db:"end_time"` // 结束时间 + TaskType string `db:"task_type"` + DeletedAt *time.Time `db:"deleted_at"` + Card string `db:"card"` } ) From 296901c592ce5a8f300c805548ddd17b4aaeb5ae Mon Sep 17 00:00:00 2001 From: tzwang Date: Wed, 22 May 2024 11:51:46 +0800 Subject: [PATCH 4/5] fix LOG bugs Former-commit-id: 15e2a7f765b3fb6a54f024ef0af127c7503693f4 --- api/internal/logic/core/pagelisttasklogic.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/api/internal/logic/core/pagelisttasklogic.go b/api/internal/logic/core/pagelisttasklogic.go index c7be973b..108b3f78 100644 --- a/api/internal/logic/core/pagelisttasklogic.go +++ b/api/internal/logic/core/pagelisttasklogic.go @@ -120,6 +120,7 @@ func (l *PageListTaskLogic) updateTaskStatus(tasklist []*types.TaskModel, ch cha tx = l.svcCtx.DbEngin.Model(task).Table("task").Where("deleted_at is null").Updates(task) if tx.Error != nil { logx.Errorf(tx.Error.Error()) + ch <- struct{}{} return } ch <- struct{}{} @@ -138,6 +139,7 @@ func (l *PageListTaskLogic) updateTaskStatus(tasklist []*types.TaskModel, ch cha tx = l.svcCtx.DbEngin.Model(task).Table("task").Where("deleted_at is null").Updates(task) if tx.Error != nil { logx.Errorf(tx.Error.Error()) + ch <- struct{}{} return } ch <- struct{}{} From 55cece2e7d082a966a67855125082a766fa5c3d2 Mon Sep 17 00:00:00 2001 From: jagger Date: Wed, 22 May 2024 11:57:49 +0800 Subject: [PATCH 5/5] fix bug Signed-off-by: jagger Former-commit-id: 35f7cdd6445c7509399141af92dd8bb49a58413e --- api/internal/logic/schedule/schedulegetdatasetslogic.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/api/internal/logic/schedule/schedulegetdatasetslogic.go b/api/internal/logic/schedule/schedulegetdatasetslogic.go index 196f9a1a..af3a0857 100644 --- a/api/internal/logic/schedule/schedulegetdatasetslogic.go +++ b/api/internal/logic/schedule/schedulegetdatasetslogic.go @@ -2,6 +2,7 @@ package schedule import ( "context" + "github.com/pkg/errors" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/storeLink" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" @@ -28,7 +29,8 @@ func (l *ScheduleGetDatasetsLogic) ScheduleGetDatasets(req *types.AiDatasetsReq) resp = &types.AiDatasetsResp{} names, err := storeLink.GetDatasetsNames(l.ctx, l.svcCtx.Scheduler.AiService.AiCollectorAdapterMap[req.AdapterId]) if err != nil { - return nil, err + logx.Errorf("GetDatasetsNames err: %v", err) + return nil, errors.New("网络异常，请稍后重试.") } resp.Datasets = names return resp, nil