Merge branch 'V20220314' into fix-1250

modules/modelarts/resty.go

@@ -35,7 +35,8 @@ const (
 	//error code
 	modelartsIllegalToken = "ModelArts.6401"
 	NotebookNotFound      = "ModelArts.6404"
-	NotebookNoPermission  = "ModelArts.6403"
+	NotebookNoPermission  = "ModelArts.6407"
+	NotebookInvalid       = "ModelArts.6400"
 )
 
 func getRestyClient() *resty.Client {

routers/repo/modelarts.go

@@ -431,24 +431,24 @@ func NotebookDel(ctx *context.Context) {
 
 	if task.Status != string(models.ModelArtsCreateFailed) && task.Status != string(models.ModelArtsStartFailed) && task.Status != string(models.ModelArtsStopped) {
 		log.Error("the job(%s) has not been stopped", task.JobName)
-		ctx.ServerError("the job has not been stopped", errors.New("the job has not been stopped"))
+		ctx.RenderWithErr("the job has not been stopped", tplDebugJobIndex, nil)
 		return
 	}
 
 	_, err := modelarts.DelNotebook2(jobID)
 	if err != nil {
 		log.Error("DelNotebook2(%s) failed:%v", task.JobName, err.Error())
-		if strings.Contains(err.Error(), modelarts.NotebookNotFound) || strings.Contains(err.Error(), modelarts.NotebookNoPermission) {
+		if strings.Contains(err.Error(), modelarts.NotebookNotFound) || strings.Contains(err.Error(), modelarts.NotebookNoPermission) || strings.Contains(err.Error(), modelarts.NotebookInvalid){
 			log.Info("old notebook version")
 		} else {
-			ctx.ServerError("DelNotebook2 failed", err)
+			ctx.RenderWithErr(err.Error(), tplDebugJobIndex, nil)
 			return
 		}
 	}
 
 	err = models.DeleteJob(task)
 	if err != nil {
-		ctx.ServerError("DeleteJob failed", err)
+		ctx.RenderWithErr(err.Error(), tplDebugJobIndex, nil)
 		return
 	}