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

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

Former-commit-id: d9ad00b59a14353b25adc91fe3665e18a84e7f5c
This commit is contained in:
tzwang 2024-06-26 09:32:00 +08:00
parent 86397eb0a6 504b3e95d9
commit dd2d384c10
1 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
api/internal/cron/aiCronTask.go
View File

@ -174,7 +174,7 @@ func UpdateTaskStatus(svc *svc.ServiceContext, tasklist []*types.TaskModel) {
}
// Update Infer Task Status
if task.TaskTypeDict == 11 {
if task.TaskTypeDict == 11 || task.TaskTypeDict == 12 {
UpdateInferTaskStatus(svc, task)
return
}
@ -229,30 +229,14 @@ func UpdateTaskStatus(svc *svc.ServiceContext, tasklist []*types.TaskModel) {
return
}
var start time.Time
var end time.Time
// distinguish train or infer temporarily
if task.TaskTypeDict == 11 {
start, _ = time.ParseInLocation(time.RFC3339, aiTask[0].StartTime, time.Local)
end, _ = time.ParseInLocation(time.RFC3339, aiTask[0].EndTime, time.Local)
} else {
start, _ = time.ParseInLocation(constants.Layout, aiTask[0].StartTime, time.Local)
end, _ = time.ParseInLocation(constants.Layout, aiTask[0].EndTime, time.Local)
}
start, _ := time.ParseInLocation(constants.Layout, aiTask[0].StartTime, time.Local)
end, _ := time.ParseInLocation(constants.Layout, aiTask[0].EndTime, time.Local)
var status string
var count int
for _, a := range aiTask {
var s time.Time
var e time.Time
// distinguish train or infer temporarily
if task.TaskTypeDict == 11 {
s, _ = time.ParseInLocation(time.RFC3339, a.StartTime, time.Local)
e, _ = time.ParseInLocation(time.RFC3339, a.EndTime, time.Local)
} else {
s, _ = time.ParseInLocation(constants.Layout, a.StartTime, time.Local)
e, _ = time.ParseInLocation(constants.Layout, a.EndTime, time.Local)
}
s, _ := time.ParseInLocation(constants.Layout, a.StartTime, time.Local)
e, _ := time.ParseInLocation(constants.Layout, a.EndTime, time.Local)
if s.Before(start) {
start = s
@ -289,15 +273,8 @@ func UpdateTaskStatus(svc *svc.ServiceContext, tasklist []*types.TaskModel) {
if status != "" {
task.Status = status
// distinguish train or infer temporarily
if task.TaskTypeDict == 11 {
task.StartTime = start.Format(time.RFC3339)
task.EndTime = end.Format(time.RFC3339)
} else {
task.StartTime = start.Format(constants.Layout)
task.EndTime = end.Format(constants.Layout)
}
task.StartTime = start.Format(constants.Layout)
task.EndTime = end.Format(constants.Layout)
}
task.UpdatedTime = time.Now().Format(constants.Layout)