Browse Source

#1654

fix bug
tags/v1.22.3.2^2
chenyifan01 3 years ago
parent
commit
23fb767efa
2 changed files with 14 additions and 4 deletions
  1. +1
    -1
      models/cloudbrain.go
  2. +13
    -3
      routers/repo/cloudbrain.go

+ 1
- 1
models/cloudbrain.go View File

@@ -1471,7 +1471,7 @@ func GetCloudBrainUnStoppedJob() ([]*Cloudbrain, error) {
}

func GetStoppedJobWithNoDurationJob() ([]*Cloudbrain, error) {
cloudbrains := make([]*Cloudbrain, 0, 10)
cloudbrains := make([]*Cloudbrain, 0)
return cloudbrains, x.
In("status", ModelArtsTrainJobCompleted, ModelArtsTrainJobFailed, ModelArtsTrainJobKilled, ModelArtsStopped, JobStopped, JobFailed, JobSucceeded).
Where("train_job_duration is null or train_job_duration = '' ").


+ 13
- 3
routers/repo/cloudbrain.go View File

@@ -1091,14 +1091,24 @@ func HandleTaskWithNoDuration(ctx *context.Context) {
task.Status = taskRes.TaskStatuses[0].State
startTime := taskRes.TaskStatuses[0].StartAt.Unix()
endTime := taskRes.TaskStatuses[0].FinishedAt.Unix()
log.Info("task startTime = %v endTime= %v", startTime, endTime)
if startTime > 0 && endTime > 0 && endTime-startTime > 0 {
log.Info("task startTime = %v endTime= %v ,jobId=%d", startTime, endTime, task.ID)
if startTime > 0 {
task.StartTime = timeutil.TimeStamp(startTime)
task.EndTime = timeutil.TimeStamp(endTime)
} else {
task.StartTime = task.CreatedUnix
}
if endTime > 0 {
task.EndTime = timeutil.TimeStamp(endTime)
} else {
task.EndTime = task.UpdatedUnix
}

if task.EndTime < task.StartTime {
log.Info("endTime[%v] is less than starTime[%v],jobId=%d", task.EndTime, task.StartTime, task.ID)
st := task.StartTime
task.StartTime = task.EndTime
task.EndTime = st
}
task.ComputeAndSetDuration()
err = models.UpdateJob(task)
if err != nil {


Loading…
Cancel
Save