Merge pull request 'fix taskresult bugs' (#197) from tzwang/pcm-coordinator:master into master
Former-commit-id: 9c354fa83ae62c8c82b27ae7f0f484c75529b2e4
This commit is contained in:
commit
0e479bba2b
|
@ -146,6 +146,7 @@ func (l *PageListTaskLogic) updateTaskStatus(tasklist []*types.TaskModel, ch cha
|
||||||
|
|
||||||
for i := len(aiTask) - 1; i >= 0; i-- {
|
for i := len(aiTask) - 1; i >= 0; i-- {
|
||||||
if aiTask[i].StartTime == "" {
|
if aiTask[i].StartTime == "" {
|
||||||
|
task.Status = aiTask[i].Status
|
||||||
aiTask = append(aiTask[:i], aiTask[i+1:]...)
|
aiTask = append(aiTask[:i], aiTask[i+1:]...)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -185,8 +185,9 @@ func (as *AiScheduler) AssignTask(clusters []*strategy.AssignedCluster) (interfa
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
result := &AiResult{}
|
||||||
mu.Lock()
|
mu.Lock()
|
||||||
result, _ := convertType(resp)
|
result, _ = convertType(resp)
|
||||||
mu.Unlock()
|
mu.Unlock()
|
||||||
|
|
||||||
result.Replica = c.Replicas
|
result.Replica = c.Replicas
|
||||||
|
|
|
@ -520,8 +520,12 @@ func (o *OctopusLink) GetTrainingTask(ctx context.Context, taskId string) (*coll
|
||||||
}
|
}
|
||||||
var task collector.Task
|
var task collector.Task
|
||||||
task.Id = jobresp.Payload.TrainJob.Id
|
task.Id = jobresp.Payload.TrainJob.Id
|
||||||
|
if jobresp.Payload.TrainJob.StartedAt != 0 {
|
||||||
task.Start = time.Unix(jobresp.Payload.TrainJob.StartedAt, 0).Format(constants.Layout)
|
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)
|
task.End = time.Unix(jobresp.Payload.TrainJob.CompletedAt, 0).Format(constants.Layout)
|
||||||
|
}
|
||||||
switch jobresp.Payload.TrainJob.Status {
|
switch jobresp.Payload.TrainJob.Status {
|
||||||
case "succeeded":
|
case "succeeded":
|
||||||
task.Status = constants.Completed
|
task.Status = constants.Completed
|
||||||
|
|
|
@ -521,8 +521,12 @@ func (s *ShuguangAi) GetTrainingTask(ctx context.Context, taskId string) (*colle
|
||||||
}
|
}
|
||||||
var task collector.Task
|
var task collector.Task
|
||||||
task.Id = jobresp.Data.Id
|
task.Id = jobresp.Data.Id
|
||||||
|
if jobresp.Data.StartTime != "" {
|
||||||
task.Start = jobresp.Data.StartTime
|
task.Start = jobresp.Data.StartTime
|
||||||
|
}
|
||||||
|
if jobresp.Data.EndTime != "" {
|
||||||
task.End = jobresp.Data.EndTime
|
task.End = jobresp.Data.EndTime
|
||||||
|
}
|
||||||
task.Status = jobresp.Data.Status
|
task.Status = jobresp.Data.Status
|
||||||
|
|
||||||
return &task, nil
|
return &task, nil
|
||||||
|
|
Loading…
Reference in New Issue