floraachy
/
pcm-coordinator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix aitask time bugs' (#236) from tzwang/pcm-coordinator:master into master 

Former-commit-id: 96c776d1c02c47bb405994aad8ccab864d3e1231
This commit is contained in:
tzwang 2024-06-22 20:25:10 +08:00
parent ae657125d1 dbb54c3924
commit 57ebcf92be
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/internal/logic/inference/imageinferencelogic.go
View File

@ -229,6 +229,7 @@ func infer(opt *option.InferOption, clusters []*strategy.AssignedCluster, ts []s
if len(cs) == 0 {
for _, t := range aiTaskList {
t.Status = constants.Failed
t.EndTime = time.Now().Format(time.RFC3339)
err := svcCtx.Scheduler.AiStorages.UpdateAiTask(t)
if err != nil {
logx.Errorf(tx.Error.Error())
@ -256,6 +257,7 @@ func infer(opt *option.InferOption, clusters []*strategy.AssignedCluster, ts []s
for _, t := range aiTaskList {
if ac.ClusterId == strconv.Itoa(int(t.ClusterId)) {
t.Status = constants.Failed
t.EndTime = time.Now().Format(time.RFC3339)
err := svcCtx.Scheduler.AiStorages.UpdateAiTask(t)
if err != nil {
logx.Errorf(tx.Error.Error())
@ -321,6 +323,7 @@ func infer(opt *option.InferOption, clusters []*strategy.AssignedCluster, ts []s
for _, t := range aiTaskList {
if c.clusterId == strconv.Itoa(int(t.ClusterId)) {
t.Status = constants.Completed
t.EndTime = time.Now().Format(time.RFC3339)
err := svcCtx.Scheduler.AiStorages.UpdateAiTask(t)
if err != nil {
logx.Errorf(tx.Error.Error())

3
api/internal/scheduler/database/aiStorage.go
View File

@ -95,6 +95,7 @@ func (s *AiStorage) GetAiTasksByAdapterId(adapterId string) ([]*models.TaskAi, e
}
func (s *AiStorage) SaveTask(name string, strategyCode int64, synergyStatus int64, aiType string) (int64, error) {
startTime := time.Now()
// 构建主任务结构体
taskModel := models.Task{
Status: constants.Saved,
@ -104,6 +105,7 @@ func (s *AiStorage) SaveTask(name string, strategyCode int64, synergyStatus int6
Strategy: strategyCode,
AdapterTypeDict: "1",
TaskTypeDict: aiType,
StartTime: &startTime,
CommitTime: time.Now(),
}
// 保存任务数据到数据库
@ -152,6 +154,7 @@ func (s *AiStorage) SaveAiTask(taskId int64, opt option.Option, adapterName stri
Status: status,
Msg: msg,
Card: aiOpt.ComputeCard,
StartTime: time.Now().Format(time.RFC3339),
CommitTime: time.Now(),
}
// 保存任务数据到数据库