#1506 解决“删除旧的云脑2调试任务”报错问题

Merged
ychao_1983 merged 1 commits from fix-1503 into V20220228 2 years ago
  1. +3
    -1
      modules/modelarts/resty.go
  2. +8
    -4
      routers/repo/modelarts.go

+ 3
- 1
modules/modelarts/resty.go View File

@@ -30,9 +30,11 @@ const (
errorCodeExceedLimit = "ModelArts.0118"

//notebook 2.0
urlNotebook2 = "/notebooks"
urlNotebook2 = "/notebooks"

//error code
modelartsIllegalToken = "ModelArts.6401"
NotebookNotFound = "ModelArts.6404"
)

func getRestyClient() *resty.Client {


+ 8
- 4
routers/repo/modelarts.go View File

@@ -307,7 +307,7 @@ func NotebookDebug2(ctx *context.Context) {
ctx.RenderWithErr(err.Error(), tplModelArtsNotebookIndex, nil)
return
}
ctx.Redirect(result.Url)
}

@@ -387,7 +387,7 @@ func NotebookManage(ctx *context.Context) {
log.Error("ManageNotebook2(%s) failed:%v", task.JobName, err.Error(), ctx.Data["MsgID"])
resultCode = "-1"
errorMsg = err.Error()
if strings.Contains(err.Error(), "ModelArts.6404") {
if strings.Contains(err.Error(), modelarts.NotebookNotFound) {
errorMsg = "the job's version is too old and can not be restarted"
}
break
@@ -428,8 +428,12 @@ func NotebookDel(ctx *context.Context) {
_, err := modelarts.DelNotebook2(jobID)
if err != nil {
log.Error("DelNotebook2(%s) failed:%v", task.JobName, err.Error())
ctx.ServerError("DelNotebook2 failed", err)
return
if strings.Contains(err.Error(), modelarts.NotebookNotFound) {
log.Info("old notebook version")
} else {
ctx.ServerError("DelNotebook2 failed", err)
return
}
}

err = models.DeleteJob(task)


Loading…
Cancel
Save