Browse Source

#1654

fix bug
tags/v1.22.3.2^2
chenyifan01 3 years ago
parent
commit
e0b49c1a63
3 changed files with 8 additions and 8 deletions
  1. +1
    -1
      routers/api/v1/repo/cloudbrain.go
  2. +3
    -3
      routers/api/v1/repo/modelarts.go
  3. +4
    -4
      routers/repo/cloudbrain.go

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

@@ -79,7 +79,7 @@ func GetCloudbrainTask(ctx *context.APIContext) {
job.ContainerID = taskRes.TaskStatuses[0].ContainerID
job.Status = taskRes.TaskStatuses[0].State

if job.StartTime == 0 {
if job.StartTime == 0 && !taskRes.TaskStatuses[0].StartAt.IsZero() {
job.StartTime = timeutil.TimeStamp(taskRes.TaskStatuses[0].StartAt.Unix())
}
}


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

@@ -68,7 +68,7 @@ func GetModelArtsNotebook2(ctx *context.APIContext) {
ctx.NotFound(err)
return
}
if job.StartTime == 0 {
if job.StartTime == 0 && result.Lease.CreateTime > 0 {
job.StartTime = timeutil.TimeStamp(result.Lease.CreateTime / 1000)
}
job.Status = result.Status
@@ -140,7 +140,7 @@ func GetModelArtsTrainJobVersion(ctx *context.APIContext) {
ctx.NotFound(err)
return
}
if job.StartTime == 0 {
if job.StartTime == 0 && result.StartTime > 0 {
job.StartTime = timeutil.TimeStamp(result.StartTime / 1000)
}
job.Status = modelarts.TransTrainJobStatus(result.IntStatus)
@@ -379,7 +379,7 @@ func GetModelArtsInferenceJob(ctx *context.APIContext) {
ctx.NotFound(err)
return
}
if job.StartTime == 0 {
if job.StartTime == 0 && result.StartTime > 0 {
job.StartTime = timeutil.TimeStamp(result.StartTime / 1000)
}
job.Status = modelarts.TransTrainJobStatus(result.IntStatus)


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

@@ -381,7 +381,7 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName) {
task.Status = taskRes.TaskStatuses[0].State
task.ContainerID = taskRes.TaskStatuses[0].ContainerID
task.ContainerIp = taskRes.TaskStatuses[0].ContainerIP
if task.StartTime == 0 {
if task.StartTime == 0 && !taskRes.TaskStatuses[0].StartAt.IsZero() {
task.StartTime = timeutil.TimeStamp(taskRes.TaskStatuses[0].StartAt.Unix())
}
err = models.UpdateJob(task)
@@ -961,7 +961,7 @@ func SyncCloudbrainStatus() {
task.Status = taskRes.TaskStatuses[0].State
if task.Status != string(models.JobWaiting) {
task.Duration = time.Now().Unix() - taskRes.TaskStatuses[0].StartAt.Unix()
if task.StartTime == 0 {
if task.StartTime == 0 && !taskRes.TaskStatuses[0].StartAt.IsZero() {
task.StartTime = timeutil.TimeStamp(taskRes.TaskStatuses[0].StartAt.Unix())
}
//if task.Status == string(models.JobFailed) {
@@ -1008,7 +1008,7 @@ func SyncCloudbrainStatus() {

if result != nil {
task.Status = result.Status
if task.StartTime == 0 {
if task.StartTime == 0 && result.Lease.CreateTime > 0 {
task.StartTime = timeutil.TimeStamp(result.Lease.CreateTime / 1000)
}
if task.EndTime == 0 && task.Status == string(models.ModelArtsStopped) {
@@ -1033,7 +1033,7 @@ func SyncCloudbrainStatus() {
task.Duration = result.Duration / 1000
task.TrainJobDuration = result.TrainJobDuration

if task.StartTime == 0 {
if task.StartTime == 0 && result.StartTime > 0 {
task.StartTime = timeutil.TimeStamp(result.StartTime / 1000)
}
if result.Duration != 0 {


Loading…
Cancel
Save