cloudbrain

routers/repo/cloudbrain.go

@@ -249,14 +249,6 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) {
 }
 
 func CloudBrainRestart(ctx *context.Context) {
-	ctx.Data["PageIsCloudBrain"] = true
-
-	/*
-		1、查询job，判断status
-		2、利用查询出来的配置重新启动一个debug环境（使用相同的名称）
-		3、更新此任务的状态
-	*/
-
 	/*
 		todo: 是否启用事务？
 		启用：处理时间可能比较长，容易出现大事务
@@ -264,39 +256,55 @@ func CloudBrainRestart(ctx *context.Context) {
 	*/
 
 	var jobID = ctx.Params(":jobid")
-	task, err := models.GetCloudbrainByJobID(jobID)
-	if err != nil {
-		log.Error("GetCloudbrainByJobID(%s) failed:%v", jobID, err.Error(), ctx.Data["MsgID"])
-		ctx.RenderWithErr(err.Error(), tplDebugJobIndex, nil)
-		return
-	}
+	var resultCode = "0"
+	var errorMsg = ""
 
-	if task.Status != string(models.JobStopped) && task.Status != string(models.JobSucceeded) && task.Status != string(models.JobFailed) {
-		log.Error("the job(%s) is not stopped", task.JobName, ctx.Data["MsgID"])
-		ctx.RenderWithErr("the job is not stopped", tplDebugJobIndex, nil)
-		return
-	}
+	for {
+		task, err := models.GetCloudbrainByJobID(jobID)
+		if err != nil {
+			log.Error("GetCloudbrainByJobID(%s) failed:%v", jobID, err.Error(), ctx.Data["MsgID"])
+			resultCode = "-1"
+			errorMsg = "system error"
+			break
+		}
 
-	count, err := models.GetCloudbrainCountByUserID(ctx.User.ID)
-	if err != nil {
-		log.Error("GetCloudbrainCountByUserID failed:%v", err, ctx.Data["MsgID"])
-		ctx.RenderWithErr("system error", tplDebugJobIndex, nil)
-		return
-	} else {
-		if count >= 1 {
-			log.Error("the user already has running or waiting task", ctx.Data["MsgID"])
-			ctx.RenderWithErr("you have already a running or waiting task, can not create more", tplDebugJobIndex, nil)
-			return
+		if task.Status != string(models.JobStopped) && task.Status != string(models.JobSucceeded) && task.Status != string(models.JobFailed) {
+			log.Error("the job(%s) is not stopped", task.JobName, ctx.Data["MsgID"])
+			resultCode = "-1"
+			errorMsg = "the job is not stopped"
+			break
 		}
-	}
 
-	err = cloudbrain.RestartTask(ctx, task)
-	if err != nil {
-		log.Error("RestartTask failed:%v", err.Error(), ctx.Data["MsgID"])
-		ctx.RenderWithErr(err.Error(), tplDebugJobIndex, nil)
-		return
+		count, err := models.GetCloudbrainCountByUserID(ctx.User.ID)
+		if err != nil {
+			log.Error("GetCloudbrainCountByUserID failed:%v", err, ctx.Data["MsgID"])
+			resultCode = "-1"
+			errorMsg = "system error"
+			break
+		} else {
+			if count >= 1 {
+				log.Error("the user already has running or waiting task", ctx.Data["MsgID"])
+				resultCode = "-1"
+				errorMsg = "the user already has running or waiting task"
+				break
+			}
+		}
+
+		err = cloudbrain.RestartTask(ctx, task)
+		if err != nil {
+			log.Error("RestartTask failed:%v", err.Error(), ctx.Data["MsgID"])
+			resultCode = "-1"
+			errorMsg = "system error"
+			break
+		}
+
+		break
 	}
-	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob")
+
+	ctx.JSON(200, map[string]string{
+		"result_code": resultCode,
+		"error_msg":   errorMsg,
+	})
 }
 
 func CloudBrainShow(ctx *context.Context) {
@@ -403,32 +411,49 @@ func CloudBrainCommitImage(ctx *context.Context, form auth.CommitImageCloudBrain
 
 func CloudBrainStop(ctx *context.Context) {
 	var jobID = ctx.Params(":jobid")
-	task, err := models.GetCloudbrainByJobID(jobID)
-	if err != nil {
-		ctx.ServerError("GetCloudbrainByJobID failed", err)
-		return
-	}
+	var resultCode = "0"
+	var errorMsg = ""
 
-	if task.Status == string(models.JobStopped) || task.Status == string(models.JobFailed) {
-		log.Error("the job(%s) has been stopped", task.JobName, ctx.Data["msgID"])
-		ctx.ServerError("the job has been stopped", errors.New("the job has been stopped"))
-		return
-	}
+	for {
+		task, err := models.GetCloudbrainByJobID(jobID)
+		if err != nil {
+			log.Error("GetCloudbrainByJobID(%s) failed:%v", task.JobName, err, ctx.Data["msgID"])
+			resultCode = "-1"
+			errorMsg = "system error"
+			break
+		}
 
-	err = cloudbrain.StopJob(jobID)
-	if err != nil {
-		log.Error("StopJob(%s) failed:%v", task.JobName, err.Error(), ctx.Data["msgID"])
-		ctx.ServerError("StopJob failed", err)
-		return
-	}
+		if task.Status == string(models.JobStopped) || task.Status == string(models.JobFailed) {
+			log.Error("the job(%s) has been stopped", task.JobName, ctx.Data["msgID"])
+			resultCode = "-1"
+			errorMsg = "system error"
+			break
+		}
 
-	task.Status = string(models.JobStopped)
-	err = models.UpdateJob(task)
-	if err != nil {
-		ctx.ServerError("UpdateJob failed", err)
-		return
+		err = cloudbrain.StopJob(jobID)
+		if err != nil {
+			log.Error("StopJob(%s) failed:%v", task.JobName, err, ctx.Data["msgID"])
+			resultCode = "-1"
+			errorMsg = "system error"
+			break
+		}
+
+		task.Status = string(models.JobStopped)
+		err = models.UpdateJob(task)
+		if err != nil {
+			log.Error("UpdateJob(%s) failed:%v", task.JobName, err, ctx.Data["msgID"])
+			resultCode = "-1"
+			errorMsg = "system error"
+			break
+		}
+
+		break
 	}
-	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob")
+
+	ctx.JSON(200, map[string]string{
+		"result_code": resultCode,
+		"error_msg":   errorMsg,
+	})
 }
 
 func StopJobsByUserID(userID int64) {