From 72704b635e723ff11924fae26b740c6b16466e10 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Mon, 11 Apr 2022 18:01:19 +0800 Subject: [PATCH 1/4] #1852 record the createTime before calling the cloudbrain task api --- modules/cloudbrain/cloudbrain.go | 5 +++++ modules/modelarts/modelarts.go | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/modules/cloudbrain/cloudbrain.go b/modules/cloudbrain/cloudbrain.go index 4a89f9393..b68004b98 100755 --- a/modules/cloudbrain/cloudbrain.go +++ b/modules/cloudbrain/cloudbrain.go @@ -1,6 +1,7 @@ package cloudbrain import ( + "code.gitea.io/gitea/modules/timeutil" "encoding/json" "errors" "strconv" @@ -194,6 +195,7 @@ func GenerateTask(ctx *context.Context, displayJobName, jobName, image, command, datasetName = attach.Name } + createTime := timeutil.TimeStampNow() jobResult, err := CreateJob(jobName, models.CreateJobParams{ JobName: jobName, RetryCount: 1, @@ -294,6 +296,7 @@ func GenerateTask(ctx *context.Context, displayJobName, jobName, image, command, BootFile: bootFile, DatasetName: datasetName, Parameters: params, + CreatedUnix: createTime, }) if err != nil { @@ -341,6 +344,7 @@ func RestartTask(ctx *context.Context, task *models.Cloudbrain, newID *string) e return errors.New("no such resourceSpec") } + createTime := timeutil.TimeStampNow() jobResult, err := CreateJob(jobName, models.CreateJobParams{ JobName: jobName, RetryCount: 1, @@ -432,6 +436,7 @@ func RestartTask(ctx *context.Context, task *models.Cloudbrain, newID *string) e GpuQueue: task.GpuQueue, ResourceSpecId: task.ResourceSpecId, ComputeResource: task.ComputeResource, + CreatedUnix: createTime, } err = models.RestartCloudbrain(task, newTask) diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index b1e7b269e..3f3d3e55b 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -1,6 +1,7 @@ package modelarts import ( + "code.gitea.io/gitea/modules/timeutil" "encoding/json" "errors" "fmt" @@ -197,6 +198,7 @@ func GenerateTask(ctx *context.Context, jobName, uuid, description, flavor strin if poolInfos == nil { json.Unmarshal([]byte(setting.PoolInfos), &poolInfos) } + createTime := timeutil.TimeStampNow() jobResult, err := CreateJob(models.CreateNotebookParams{ JobName: jobName, Description: description, @@ -235,6 +237,7 @@ func GenerateTask(ctx *context.Context, jobName, uuid, description, flavor strin Type: models.TypeCloudBrainTwo, Uuid: uuid, ComputeResource: models.NPUResource, + CreatedUnix: createTime, }) if err != nil { @@ -254,7 +257,7 @@ func GenerateNotebook2(ctx *context.Context, displayJobName, jobName, uuid, desc log.Error("GetNotebookImageName failed: %v", err.Error()) return err } - + createTime := timeutil.TimeStampNow() jobResult, err := createNotebook2(models.CreateNotebook2Params{ JobName: jobName, Description: description, @@ -288,6 +291,7 @@ func GenerateNotebook2(ctx *context.Context, displayJobName, jobName, uuid, desc ComputeResource: models.NPUResource, Image: imageName, Description: description, + CreatedUnix: createTime, }) if err != nil { @@ -304,6 +308,7 @@ func GenerateNotebook2(ctx *context.Context, displayJobName, jobName, uuid, desc } func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (err error) { + createTime := timeutil.TimeStampNow() jobResult, err := createTrainJob(models.CreateTrainJobParams{ JobName: req.JobName, Description: req.Description, @@ -364,6 +369,7 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (err error EngineName: req.EngineName, VersionCount: req.VersionCount, TotalVersionCount: req.TotalVersionCount, + CreatedUnix: createTime, }) if err != nil { @@ -375,6 +381,7 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (err error } func GenerateTrainJobVersion(ctx *context.Context, req *GenerateTrainJobReq, jobId string) (err error) { + createTime := timeutil.TimeStampNow() jobResult, err := createTrainJobVersion(models.CreateTrainJobVersionParams{ Description: req.Description, Config: models.TrainJobVersionConfig{ @@ -451,6 +458,7 @@ func GenerateTrainJobVersion(ctx *context.Context, req *GenerateTrainJobReq, job EngineName: req.EngineName, TotalVersionCount: VersionTaskList[0].TotalVersionCount + 1, VersionCount: VersionListCount + 1, + CreatedUnix: createTime, }) if err != nil { log.Error("CreateCloudbrain(%s) failed:%v", req.JobName, err.Error()) @@ -526,6 +534,7 @@ func GetOutputPathByCount(TotalVersionCount int) (VersionOutputPath string) { } func GenerateInferenceJob(ctx *context.Context, req *GenerateInferenceJobReq) (err error) { + createTime := timeutil.TimeStampNow() jobResult, err := createInferenceJob(models.CreateInferenceJobParams{ JobName: req.JobName, Description: req.Description, @@ -591,6 +600,7 @@ func GenerateInferenceJob(ctx *context.Context, req *GenerateInferenceJobReq) (e ModelVersion: req.ModelVersion, CkptName: req.CkptName, ResultUrl: req.ResultUrl, + CreatedUnix: createTime, }) if err != nil { From d479fe8f1d6e575417f2f2be8a5efd2031655873 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Tue, 12 Apr 2022 10:35:41 +0800 Subject: [PATCH 2/4] #1852 update --- models/cloudbrain.go | 5 ++++- modules/cloudbrain/cloudbrain.go | 1 + modules/modelarts/modelarts.go | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 4a82a2031..451a2a77e 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1353,8 +1353,11 @@ func CloudbrainsVersionList(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int, e } func CreateCloudbrain(cloudbrain *Cloudbrain) (err error) { + sess := x.NewSession() + defer sess.Close() + cloudbrain.TrainJobDuration = DURATION_STR_ZERO - if _, err = x.Insert(cloudbrain); err != nil { + if _, err = sess.NoAutoTime().Insert(cloudbrain); err != nil { return err } return nil diff --git a/modules/cloudbrain/cloudbrain.go b/modules/cloudbrain/cloudbrain.go index b68004b98..f450c8b27 100755 --- a/modules/cloudbrain/cloudbrain.go +++ b/modules/cloudbrain/cloudbrain.go @@ -297,6 +297,7 @@ func GenerateTask(ctx *context.Context, displayJobName, jobName, image, command, DatasetName: datasetName, Parameters: params, CreatedUnix: createTime, + UpdatedUnix: createTime, }) if err != nil { diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index 3f3d3e55b..78b40fd56 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -238,6 +238,7 @@ func GenerateTask(ctx *context.Context, jobName, uuid, description, flavor strin Uuid: uuid, ComputeResource: models.NPUResource, CreatedUnix: createTime, + UpdatedUnix: createTime, }) if err != nil { @@ -292,6 +293,7 @@ func GenerateNotebook2(ctx *context.Context, displayJobName, jobName, uuid, desc Image: imageName, Description: description, CreatedUnix: createTime, + UpdatedUnix: createTime, }) if err != nil { @@ -370,6 +372,7 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (err error VersionCount: req.VersionCount, TotalVersionCount: req.TotalVersionCount, CreatedUnix: createTime, + UpdatedUnix: createTime, }) if err != nil { @@ -459,6 +462,7 @@ func GenerateTrainJobVersion(ctx *context.Context, req *GenerateTrainJobReq, job TotalVersionCount: VersionTaskList[0].TotalVersionCount + 1, VersionCount: VersionListCount + 1, CreatedUnix: createTime, + UpdatedUnix: createTime, }) if err != nil { log.Error("CreateCloudbrain(%s) failed:%v", req.JobName, err.Error()) @@ -601,6 +605,7 @@ func GenerateInferenceJob(ctx *context.Context, req *GenerateInferenceJobReq) (e CkptName: req.CkptName, ResultUrl: req.ResultUrl, CreatedUnix: createTime, + UpdatedUnix: createTime, }) if err != nil { From 954f3939becbb97871fda3c46b07eb65c0aaaa33 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Tue, 12 Apr 2022 10:49:16 +0800 Subject: [PATCH 3/4] #1852 update --- models/cloudbrain.go | 2 +- modules/cloudbrain/cloudbrain.go | 1 + routers/repo/modelarts.go | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 451a2a77e..26cd43449 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1572,7 +1572,7 @@ func RestartCloudbrain(old *Cloudbrain, new *Cloudbrain) (err error) { return err } - if _, err = sess.Insert(new); err != nil { + if _, err = sess.NoAutoTime().Insert(new); err != nil { sess.Rollback() return err } diff --git a/modules/cloudbrain/cloudbrain.go b/modules/cloudbrain/cloudbrain.go index f450c8b27..dab2941d0 100755 --- a/modules/cloudbrain/cloudbrain.go +++ b/modules/cloudbrain/cloudbrain.go @@ -438,6 +438,7 @@ func RestartTask(ctx *context.Context, task *models.Cloudbrain, newID *string) e ResourceSpecId: task.ResourceSpecId, ComputeResource: task.ComputeResource, CreatedUnix: createTime, + UpdatedUnix: createTime, } err = models.RestartCloudbrain(task, newTask) diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 933571a0b..6feeda678 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -439,6 +439,7 @@ func NotebookManage(ctx *context.Context) { param := models.NotebookAction{ Action: action, } + createTime := timeutil.TimeStampNow() res, err := modelarts.ManageNotebook2(task.JobID, param) if err != nil { log.Error("ManageNotebook2(%s) failed:%v", task.JobName, err.Error(), ctx.Data["MsgID"]) @@ -465,6 +466,8 @@ func NotebookManage(ctx *context.Context) { Image: task.Image, ComputeResource: task.ComputeResource, Description: task.Description, + CreatedUnix: createTime, + UpdatedUnix: createTime, } err = models.RestartCloudbrain(task, newTask) From a5c7f942ed209d4f616f85d596c832b478f2e0e6 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Tue, 12 Apr 2022 17:48:11 +0800 Subject: [PATCH 4/4] #1852 update --- models/cloudbrain.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 26cd43449..98b23b552 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1353,11 +1353,8 @@ func CloudbrainsVersionList(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int, e } func CreateCloudbrain(cloudbrain *Cloudbrain) (err error) { - sess := x.NewSession() - defer sess.Close() - cloudbrain.TrainJobDuration = DURATION_STR_ZERO - if _, err = sess.NoAutoTime().Insert(cloudbrain); err != nil { + if _, err = x.NoAutoTime().Insert(cloudbrain); err != nil { return err } return nil