#1251 解决云脑运行时长为空的问题

Merged
ychao_1983 merged 2 commits from fix-1233 into V20220110 2 years ago
  1. +10
    -0
      modules/util/util.go
  2. +2
    -10
      routers/api/v1/repo/modelarts.go
  3. +12
    -6
      routers/repo/cloudbrain.go

+ 10
- 0
modules/util/util.go View File

@@ -6,6 +6,7 @@ package util


import ( import (
"bytes" "bytes"
"strconv"
"strings" "strings"
) )


@@ -100,3 +101,12 @@ func NormalizeEOL(input []byte) []byte {
} }
return tmp[:pos] return tmp[:pos]
} }

func AddZero(t int64) (m string) {
if t < 10 {
m = "0" + strconv.FormatInt(t, 10)
return m
} else {
return strconv.FormatInt(t, 10)
}
}

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

@@ -6,6 +6,7 @@
package repo package repo


import ( import (
"code.gitea.io/gitea/modules/util"
"net/http" "net/http"
"strconv" "strconv"
"strings" "strings"
@@ -106,7 +107,7 @@ func GetModelArtsTrainJobVersion(ctx *context.APIContext) {
job.TrainJobDuration = result.TrainJobDuration job.TrainJobDuration = result.TrainJobDuration


if result.Duration != 0 { if result.Duration != 0 {
job.TrainJobDuration = addZero(result.Duration/3600000) + ":" + addZero(result.Duration%3600000/60000) + ":" + addZero(result.Duration%60000/1000)
job.TrainJobDuration = util.AddZero(result.Duration/3600000) + ":" + util.AddZero(result.Duration%3600000/60000) + ":" + util.AddZero(result.Duration%60000/1000)


} else { } else {
job.TrainJobDuration = "00:00:00" job.TrainJobDuration = "00:00:00"
@@ -125,15 +126,6 @@ func GetModelArtsTrainJobVersion(ctx *context.APIContext) {


} }


func addZero(t int64) (m string) {
if t < 10 {
m = "0" + strconv.FormatInt(t, 10)
return m
} else {
return strconv.FormatInt(t, 10)
}
}

func TrainJobGetLog(ctx *context.APIContext) { func TrainJobGetLog(ctx *context.APIContext) {
var ( var (
err error err error


+ 12
- 6
routers/repo/cloudbrain.go View File

@@ -14,18 +14,17 @@ import (
"strings" "strings"
"time" "time"


"code.gitea.io/gitea/modules/modelarts"

"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/storage"

"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/auth" "code.gitea.io/gitea/modules/auth"
"code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/cloudbrain" "code.gitea.io/gitea/modules/cloudbrain"
"code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/modelarts"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/storage"
"code.gitea.io/gitea/modules/util"
) )


const ( const (
@@ -277,7 +276,7 @@ func CloudBrainRestart(ctx *context.Context) {
break break
} }


if !ctx.IsSigned || (ctx.User.ID != task.UserID && !ctx.IsUserSiteAdmin()){
if !ctx.IsSigned || (ctx.User.ID != task.UserID && !ctx.IsUserSiteAdmin()) {
log.Error("the user has no right ro restart the job", task.JobName, ctx.Data["MsgID"]) log.Error("the user has no right ro restart the job", task.JobName, ctx.Data["MsgID"])
resultCode = "-1" resultCode = "-1"
errorMsg = "you have no right to restart the job" errorMsg = "you have no right to restart the job"
@@ -949,6 +948,13 @@ func SyncCloudbrainStatus() {
task.Duration = result.Duration task.Duration = result.Duration
task.TrainJobDuration = result.TrainJobDuration task.TrainJobDuration = result.TrainJobDuration


if result.Duration != 0 {
task.TrainJobDuration = util.AddZero(result.Duration/3600000) + ":" + util.AddZero(result.Duration%3600000/60000) + ":" + util.AddZero(result.Duration%60000/1000)

} else {
task.TrainJobDuration = "00:00:00"
}

err = models.UpdateJob(task) err = models.UpdateJob(task)
if err != nil { if err != nil {
log.Error("UpdateJob(%s) failed:%v", task.JobName, err) log.Error("UpdateJob(%s) failed:%v", task.JobName, err)


Loading…
Cancel
Save