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

fix crontask bug 

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

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

@ -174,7 +174,7 @@ func UpdateTaskStatus(svc *svc.ServiceContext, tasklist []*types.TaskModel) {
} }
// Update Infer Task Status // Update Infer Task Status
if task.TaskTypeDict == 11 { if task.TaskTypeDict == 11 || task.TaskTypeDict == 12 {
UpdateInferTaskStatus(svc, task) UpdateInferTaskStatus(svc, task)
return return
} }
@ -229,30 +229,14 @@ func UpdateTaskStatus(svc *svc.ServiceContext, tasklist []*types.TaskModel) {
return return
} }
var start time.Time start, _ := time.ParseInLocation(constants.Layout, aiTask[0].StartTime, time.Local)
var end time.Time end, _ := time.ParseInLocation(constants.Layout, aiTask[0].EndTime, time.Local)
// 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)
}
var status string var status string
var count int var count int
for _, a := range aiTask { for _, a := range aiTask {
var s time.Time s, _ := time.ParseInLocation(constants.Layout, a.StartTime, time.Local)
var e time.Time e, _ := time.ParseInLocation(constants.Layout, a.EndTime, time.Local)
// 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)
}
if s.Before(start) { if s.Before(start) {
start = s start = s
@ -289,17 +273,10 @@ func UpdateTaskStatus(svc *svc.ServiceContext, tasklist []*types.TaskModel) {
if status != "" { if status != "" {
task.Status = 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.StartTime = start.Format(constants.Layout)
task.EndTime = end.Format(constants.Layout) task.EndTime = end.Format(constants.Layout)
} }
}
task.UpdatedTime = time.Now().Format(constants.Layout) task.UpdatedTime = time.Now().Format(constants.Layout)
tx = svc.DbEngin.Table("task").Model(task).Updates(task) tx = svc.DbEngin.Table("task").Model(task).Updates(task)
if tx.Error != nil { if tx.Error != nil {