Browse Source

#1654

update
tags/v1.22.3.2^2
chenyifan01 3 years ago
parent
commit
f8d2c82f3f
3 changed files with 11 additions and 2 deletions
  1. +4
    -0
      models/cloudbrain.go
  2. +3
    -1
      routers/api/v1/repo/modelarts.go
  3. +4
    -1
      routers/repo/cloudbrain.go

+ 4
- 0
models/cloudbrain.go View File

@@ -165,6 +165,10 @@ func (task *Cloudbrain) ComputeDuration() int64 {
return d
}

func IsTrainJobTerminal(status string) bool {
return status == string(ModelArtsTrainJobCompleted) || status == string(ModelArtsTrainJobFailed) || status == string(ModelArtsTrainJobKilled)
}

type CloudbrainInfo struct {
Cloudbrain `xorm:"extends"`
User `xorm:"extends"`


+ 3
- 1
routers/api/v1/repo/modelarts.go View File

@@ -140,7 +140,9 @@ func GetModelArtsTrainJobVersion(ctx *context.APIContext) {
ctx.NotFound(err)
return
}

if job.StartTime == 0 {
job.StartTime = timeutil.TimeStamp(result.StartTime / 1000)
}
job.Status = modelarts.TransTrainJobStatus(result.IntStatus)
job.Duration = result.Duration
job.TrainJobDuration = result.TrainJobDuration


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

@@ -1034,7 +1034,7 @@ func SyncCloudbrainStatus() {
task.TrainJobDuration = result.TrainJobDuration

if task.StartTime == 0 {
task.StartTime = timeutil.TimeStamp(result.StartTime)
task.StartTime = timeutil.TimeStamp(result.StartTime / 1000)
}
if result.Duration != 0 {
task.TrainJobDuration = util.AddZero(result.Duration/3600000) + ":" + util.AddZero(result.Duration%3600000/60000) + ":" + util.AddZero(result.Duration%60000/1000)
@@ -1042,6 +1042,9 @@ func SyncCloudbrainStatus() {
} else {
task.TrainJobDuration = "00:00:00"
}
if models.IsTrainJobTerminal(task.Status) {
task.EndTime = task.StartTime.Add(task.Duration / 1000)
}

err = models.UpdateJob(task)
if err != nil {


Loading…
Cancel
Save