Browse Source

Merge pull request '修复"#2872 有时候运行时长显示00:00:0-1"' (#2893) from fix-2872 into V20220926

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2893
Reviewed-by: ychao_1983 <ychao_1983@sina.com>
point-v3
ychao_1983 2 years ago
parent
commit
e9f3120e06
3 changed files with 8 additions and 1 deletions
  1. +1
    -1
      models/cloudbrain.go
  2. +4
    -0
      routers/repo/cloudbrain.go
  3. +3
    -0
      routers/repo/grampus.go

+ 1
- 1
models/cloudbrain.go View File

@@ -278,7 +278,7 @@ func (task *Cloudbrain) IsRunning() bool {
}

func ConvertDurationToStr(duration int64) string {
if duration == 0 {
if duration <= 0 {
return DURATION_STR_ZERO
}
return util.AddZero(duration/3600) + ":" + util.AddZero(duration%3600/60) + ":" + util.AddZero(duration%60)


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

@@ -1840,6 +1840,10 @@ func SyncCloudbrainStatus() {
oldStatus := task.Status
task.Status = grampus.TransTrainJobStatus(result.JobInfo.Status)
task.Duration = result.JobInfo.RunSec

if task.Duration < 0 {
task.Duration = 0
}
task.TrainJobDuration = models.ConvertDurationToStr(task.Duration)

if task.StartTime == 0 && result.JobInfo.StartedAt > 0 {


+ 3
- 0
routers/repo/grampus.go View File

@@ -709,6 +709,9 @@ func GrampusTrainJobShow(ctx *context.Context) {
task.Status = grampus.TransTrainJobStatus(result.JobInfo.Status)
if task.Status != result.JobInfo.Status || result.JobInfo.Status == models.GrampusStatusRunning {
task.Duration = result.JobInfo.RunSec
if task.Duration < 0 {
task.Duration = 0
}
task.TrainJobDuration = models.ConvertDurationToStr(task.Duration)

if task.StartTime == 0 && result.JobInfo.StartedAt > 0 {


Loading…
Cancel
Save