Browse Source

#2026

update
tags/v1.22.6.1^2
chenyifan01 3 years ago
parent
commit
e8f24be5c4
2 changed files with 9 additions and 4 deletions
  1. +5
    -0
      models/cloudbrain.go
  2. +4
    -4
      routers/repo/cloudbrain.go

+ 5
- 0
models/cloudbrain.go View File

@@ -1489,6 +1489,11 @@ func UpdateJob(job *Cloudbrain) error {
return updateJob(x, job)
}

func UpdateJobDurationWithDeleted(job *Cloudbrain) error {
_, err := x.Exec("update cloudbrain set start_time=?, end_time=?,train_job_duration=?,duration=? where id=?", job.StartTime, job.EndTime, job.TrainJobDuration, job.Duration, job.ID)
return err
}

func updateJob(e Engine, job *Cloudbrain) error {
_, err := e.ID(job.ID).AllCols().Update(job)
return err


+ 4
- 4
routers/repo/cloudbrain.go View File

@@ -1572,7 +1572,7 @@ func handleNoDurationTask(cloudBrains []*models.Cloudbrain) {
}
task.Duration = task.EndTime.AsTime().Unix() - task.StartTime.AsTime().Unix()
task.TrainJobDuration = models.ConvertDurationToStr(task.Duration)
err = models.UpdateJob(task)
err = models.UpdateJobDurationWithDeleted(task)
if err != nil {
log.Error("UpdateJob(%s) failed:%v", task.JobName, err)
}
@@ -1597,7 +1597,7 @@ func handleNoDurationTask(cloudBrains []*models.Cloudbrain) {
}
task.CorrectCreateUnix()
task.ComputeAndSetDuration()
err = models.UpdateJob(task)
err = models.UpdateJobDurationWithDeleted(task)
if err != nil {
log.Error("UpdateJob(%s) failed:%v", task.JobName, err)
continue
@@ -1618,7 +1618,7 @@ func handleNoDurationTask(cloudBrains []*models.Cloudbrain) {
task.EndTime = task.StartTime.Add(result.Duration / 1000)
}
task.ComputeAndSetDuration()
err = models.UpdateJob(task)
err = models.UpdateJobDurationWithDeleted(task)
if err != nil {
log.Error("UpdateJob(%s) failed:%v", task.JobName, err)
continue
@@ -1639,7 +1639,7 @@ func updateDefaultDuration(task *models.Cloudbrain) {
task.StartTime = task.CreatedUnix
task.EndTime = task.UpdatedUnix
task.ComputeAndSetDuration()
err := models.UpdateJob(task)
err := models.UpdateJobDurationWithDeleted(task)
if err != nil {
log.Error("UpdateJob(%s) failed:%v", task.JobName, err)
}


Loading…
Cancel
Save