From a6378dfc5f858e3b5c8fa7df21a47c79f582329d Mon Sep 17 00:00:00 2001
From: lewis <747342561@qq.com>
Date: Mon, 28 Mar 2022 15:15:07 +0800
Subject: [PATCH 1/3] notebook restart record

---
 routers/repo/modelarts.go | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go
index 7d4c203bc..ce6011514 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -424,6 +424,33 @@ func NotebookManage(ctx *context.Context) {
 		}
 
 		status = task.Status
+		if action == models.ActionRestart {
+			//todo: add a record
+			newTask := &models.Cloudbrain{
+				Status:          string(models.JobWaiting),
+				UserID:          task.UserID,
+				RepoID:          task.RepoID,
+				JobID:           task.JobID,
+				JobName:         task.JobName,
+				DisplayJobName:  task.DisplayJobName,
+				SubTaskName:     task.SubTaskName,
+				JobType:         task.JobType,
+				Type:            task.Type,
+				Uuid:            task.Uuid,
+				Image:           task.Image,
+				GpuQueue:        task.GpuQueue,
+				ResourceSpecId:  task.ResourceSpecId,
+				ComputeResource: task.ComputeResource,
+			}
+
+			err = models.RestartCloudbrain(task, newTask)
+			if err != nil {
+				log.Error("RestartCloudbrain(%s) failed:%v", task.JobName, err.Error(), ctx.Data["MsgID"])
+				resultCode = "-1"
+				errorMsg = "system error"
+				break
+			}
+		}
 
 		break
 	}

From d2bb1f5ed0b7efa321c84b14ee6589f383fdd84b Mon Sep 17 00:00:00 2001
From: lewis <747342561@qq.com>
Date: Mon, 28 Mar 2022 18:11:40 +0800
Subject: [PATCH 2/3] notebook restart

---
 routers/repo/modelarts.go | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go
index ce6011514..02a46b492 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -411,36 +411,21 @@ func NotebookManage(ctx *context.Context) {
 		}
 
 		task.Status = res.Status
-		if task.EndTime == 0 && models.IsModelArtsDebugJobTerminal(task.Status) {
-			task.EndTime = timeutil.TimeStampNow()
-		}
-		task.ComputeAndSetDuration()
-		err = models.UpdateJob(task)
-		if err != nil {
-			log.Error("UpdateJob(%s) failed:%v", task.JobName, err.Error(), ctx.Data["MsgID"])
-			resultCode = "-1"
-			errorMsg = "system error"
-			break
-		}
-
 		status = task.Status
-		if action == models.ActionRestart {
-			//todo: add a record
+		if action == models.ActionStart {
 			newTask := &models.Cloudbrain{
-				Status:          string(models.JobWaiting),
+				Status:          status,
 				UserID:          task.UserID,
 				RepoID:          task.RepoID,
 				JobID:           task.JobID,
 				JobName:         task.JobName,
 				DisplayJobName:  task.DisplayJobName,
-				SubTaskName:     task.SubTaskName,
 				JobType:         task.JobType,
 				Type:            task.Type,
 				Uuid:            task.Uuid,
 				Image:           task.Image,
-				GpuQueue:        task.GpuQueue,
-				ResourceSpecId:  task.ResourceSpecId,
 				ComputeResource: task.ComputeResource,
+				Description:	 task.Description,
 			}
 
 			err = models.RestartCloudbrain(task, newTask)
@@ -450,6 +435,18 @@ func NotebookManage(ctx *context.Context) {
 				errorMsg = "system error"
 				break
 			}
+		} else {
+			if task.EndTime == 0 && models.IsModelArtsDebugJobTerminal(task.Status) {
+				task.EndTime = timeutil.TimeStampNow()
+			}
+			task.ComputeAndSetDuration()
+			err = models.UpdateJob(task)
+			if err != nil {
+				log.Error("UpdateJob(%s) failed:%v", task.JobName, err.Error(), ctx.Data["MsgID"])
+				resultCode = "-1"
+				errorMsg = "system error"
+				break
+			}
 		}
 
 		break

From dadc4b98d452f6a6a00e9f7ca96f59cad8fa8d9f Mon Sep 17 00:00:00 2001
From: lewis <747342561@qq.com>
Date: Tue, 29 Mar 2022 15:44:33 +0800
Subject: [PATCH 3/3] notebook opt

---
 routers/repo/modelarts.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go
index 02a46b492..a9188afd4 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -410,8 +410,7 @@ func NotebookManage(ctx *context.Context) {
 			break
 		}
 
-		task.Status = res.Status
-		status = task.Status
+		status = res.Status
 		if action == models.ActionStart {
 			newTask := &models.Cloudbrain{
 				Status:          status,
@@ -435,7 +434,9 @@ func NotebookManage(ctx *context.Context) {
 				errorMsg = "system error"
 				break
 			}
+			ID = strconv.FormatInt(newTask.ID, 10)
 		} else {
+			task.Status = res.Status
 			if task.EndTime == 0 && models.IsModelArtsDebugJobTerminal(task.Status) {
 				task.EndTime = timeutil.TimeStampNow()
 			}