From e0ddc24fe2adaf860cfbed45774f29593c28b8f1 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Fri, 16 Sep 2022 09:22:30 +0800 Subject: [PATCH 1/2] #2872 fix bug --- models/cloudbrain.go | 2 +- routers/repo/cloudbrain.go | 2 +- routers/repo/grampus.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index fa9a27bb9..f1a99577b 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -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) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index e58ec45c2..c521626cb 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -1840,7 +1840,6 @@ func SyncCloudbrainStatus() { oldStatus := task.Status task.Status = grampus.TransTrainJobStatus(result.JobInfo.Status) task.Duration = result.JobInfo.RunSec - task.TrainJobDuration = models.ConvertDurationToStr(task.Duration) if task.StartTime == 0 && result.JobInfo.StartedAt > 0 { task.StartTime = timeutil.TimeStamp(result.JobInfo.StartedAt) @@ -1849,6 +1848,7 @@ func SyncCloudbrainStatus() { task.EndTime = task.StartTime.Add(task.Duration) } task.CorrectCreateUnix() + task.ComputeAndSetDuration() if oldStatus != task.Status { notification.NotifyChangeCloudbrainStatus(task, oldStatus) } diff --git a/routers/repo/grampus.go b/routers/repo/grampus.go index b204d20da..a677f08a4 100755 --- a/routers/repo/grampus.go +++ b/routers/repo/grampus.go @@ -709,7 +709,6 @@ 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 - task.TrainJobDuration = models.ConvertDurationToStr(task.Duration) if task.StartTime == 0 && result.JobInfo.StartedAt > 0 { task.StartTime = timeutil.TimeStamp(result.JobInfo.StartedAt) @@ -718,6 +717,7 @@ func GrampusTrainJobShow(ctx *context.Context) { task.EndTime = task.StartTime.Add(task.Duration) } task.CorrectCreateUnix() + task.ComputeAndSetDuration() if oldStatus != task.Status { notification.NotifyChangeCloudbrainStatus(task, oldStatus) } From 0f02a98f6699b769d281dbceba079a0609dc8a9e Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Fri, 16 Sep 2022 09:37:24 +0800 Subject: [PATCH 2/2] #2872 fix bug --- routers/repo/cloudbrain.go | 6 +++++- routers/repo/grampus.go | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index c521626cb..27670f23c 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -1841,6 +1841,11 @@ func SyncCloudbrainStatus() { 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 { task.StartTime = timeutil.TimeStamp(result.JobInfo.StartedAt) } @@ -1848,7 +1853,6 @@ func SyncCloudbrainStatus() { task.EndTime = task.StartTime.Add(task.Duration) } task.CorrectCreateUnix() - task.ComputeAndSetDuration() if oldStatus != task.Status { notification.NotifyChangeCloudbrainStatus(task, oldStatus) } diff --git a/routers/repo/grampus.go b/routers/repo/grampus.go index a677f08a4..6ba25137d 100755 --- a/routers/repo/grampus.go +++ b/routers/repo/grampus.go @@ -709,6 +709,10 @@ 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 { task.StartTime = timeutil.TimeStamp(result.JobInfo.StartedAt) @@ -717,7 +721,6 @@ func GrampusTrainJobShow(ctx *context.Context) { task.EndTime = task.StartTime.Add(task.Duration) } task.CorrectCreateUnix() - task.ComputeAndSetDuration() if oldStatus != task.Status { notification.NotifyChangeCloudbrainStatus(task, oldStatus) }