Merge pull request 'fix taskresult bugs' (#197) from tzwang/pcm-coordinator:master into master

Former-commit-id: 9c354fa83ae62c8c82b27ae7f0f484c75529b2e4
This commit is contained in:
tzwang 2024-05-21 16:34:42 +08:00
commit 0e479bba2b
4 changed files with 15 additions and 5 deletions

View File

@ -146,6 +146,7 @@ func (l *PageListTaskLogic) updateTaskStatus(tasklist []*types.TaskModel, ch cha
for i := len(aiTask) - 1; i >= 0; i-- {
if aiTask[i].StartTime == "" {
task.Status = aiTask[i].Status
aiTask = append(aiTask[:i], aiTask[i+1:]...)
}
}

View File

@ -185,8 +185,9 @@ func (as *AiScheduler) AssignTask(clusters []*strategy.AssignedCluster) (interfa
return
}
result := &AiResult{}
mu.Lock()
result, _ := convertType(resp)
result, _ = convertType(resp)
mu.Unlock()
result.Replica = c.Replicas

View File

@ -520,8 +520,12 @@ func (o *OctopusLink) GetTrainingTask(ctx context.Context, taskId string) (*coll
}
var task collector.Task
task.Id = jobresp.Payload.TrainJob.Id
task.Start = time.Unix(jobresp.Payload.TrainJob.StartedAt, 0).Format(constants.Layout)
task.End = time.Unix(jobresp.Payload.TrainJob.CompletedAt, 0).Format(constants.Layout)
if jobresp.Payload.TrainJob.StartedAt != 0 {
task.Start = time.Unix(jobresp.Payload.TrainJob.StartedAt, 0).Format(constants.Layout)
}
if jobresp.Payload.TrainJob.CompletedAt != 0 {
task.End = time.Unix(jobresp.Payload.TrainJob.CompletedAt, 0).Format(constants.Layout)
}
switch jobresp.Payload.TrainJob.Status {
case "succeeded":
task.Status = constants.Completed

View File

@ -521,8 +521,12 @@ func (s *ShuguangAi) GetTrainingTask(ctx context.Context, taskId string) (*colle
}
var task collector.Task
task.Id = jobresp.Data.Id
task.Start = jobresp.Data.StartTime
task.End = jobresp.Data.EndTime
if jobresp.Data.StartTime != "" {
task.Start = jobresp.Data.StartTime
}
if jobresp.Data.EndTime != "" {
task.End = jobresp.Data.EndTime
}
task.Status = jobresp.Data.Status
return &task, nil