modules/modelarts/resty.go

@@ -1036,14 +1036,16 @@ func DelTrainJob(jobID string) (*models.TrainJobResult, error) {
 	var result models.TrainJobResult
 
 	//get cloudbrain job by jobid
-	finetuneJob, _ := models.GetCloudbrainByJobID(jobID)
-	log.Info("调试：%s", finetuneJob.FineTune)
-	if finetuneJob.FineTune {
-		err := ServiceDelete(jobID)
-		if err != nil {
-			log.Error("盘古微调部署: Delete Deploy failed:%s %v", jobID, err.Error())
-			return &result, err
+	if finetuneJob, err := models.GetCloudbrainByJobID(jobID); finetuneJob != nil && err == nil {
+		if finetuneJob.FineTune {
+			err := ServiceDelete(jobID)
+			if err != nil {
+				log.Error("panguService: Delete Deploy failed:%s %v", jobID, err.Error())
+				return nil, err
+			}
 		}
+	} else if err != nil {
+		log.Warn("DelTrainJob GetCloudbrainByJobID from DB failed:%s %v", jobID, err.Error())
 	}
 
 	retry := 0
@@ -1145,14 +1147,16 @@ func DelTrainJobVersion(jobID string, versionID string) (*models.TrainJobResult,
 	var result models.TrainJobResult
 
 	//get cloudbrain job by jobid
-	finetuneJob, _ := models.GetCloudbrainByJobID(jobID)
-	log.Info("调试：%s", finetuneJob.FineTune)
-	if finetuneJob.FineTune {
-		err := ServiceDelete(jobID)
-		if err != nil {
-			log.Error("盘古微调部署: Delete Deploy failed:%s %v", jobID, err.Error())
-			return &result, err
+	if finetuneJob, err := models.GetCloudbrainByJobID(jobID); finetuneJob != nil && err == nil {
+		if finetuneJob.FineTune {
+			err := ServiceDelete(jobID)
+			if err != nil {
+				log.Error("panguService: Delete Deploy failed:%s %v", jobID, err.Error())
+				return nil, err
+			}
 		}
+	} else if err != nil {
+		log.Warn("DelTrainJobVersion GetCloudbrainByJobID failed, cannnot get job from DB:%s %v", jobID, err.Error())
 	}
 
 	retry := 0
@@ -1859,28 +1863,30 @@ sendjob:
 func ServiceDelete(jobID string) error {
 	if deploy, _ := models.GetModelartsDeployByJobID(jobID); deploy != nil {
 		if deploy.Status == "STOP" || deploy.Status == "FAILED" {
+
 			if deploy.ServiceID != "" {
-				err := DeleteDeployService(deploy.ServiceID)
-				if err != nil {
+				if err := DeleteDeployService(deploy.ServiceID); err != nil {
 					log.Error("panguService: Delete DeployService API failed:%s %v", jobID, err.Error())
-					return err
+				} else {
+					log.Info("panguService: deploy service delete success %s", jobID)
 				}
-				log.Info("panguService: deploy service delete success %s", jobID)
 			}
+
 			if deploy.ModelID != "" {
-				err := DeleteDeployModel(deploy.ModelID)
-				if err != nil {
+				if err := DeleteDeployModel(deploy.ModelID); err != nil {
 					log.Error("panguService: Delete DeployModel API failed:%s %v", jobID, err.Error())
-					return err
+				} else {
+					log.Info("panguService: deploy model delete success %s", jobID)
 				}
-				log.Info("panguService: deploy model delete success %s", jobID)
 			}
-			err := models.DeleteModelartsDeploy(jobID)
-			if err != nil {
+
+			if err := models.DeleteModelartsDeploy(jobID); err != nil {
 				log.Error("panguService: Delete ModelartsDeploy from DB failed:%s %v", jobID, err.Error())
 				return err
+			} else {
+				log.Info("panguService: deploy DB record delete success %s", jobID)
 			}
-			log.Info("panguService: deploy DB record delete success %s", jobID)
+
 		} else {
 			log.Error("the job(%s) is a deploying finetune job, can be not deleted", jobID)
 			return fmt.Errorf("1")

routers/repo/setting.go

@@ -489,20 +489,20 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) {
 			ctx.RenderWithErr(ctx.Tr("form.enterred_invalid_repo_name"), tplSettingsOptions, nil)
 			return
 		}
-		deployments, err := models.GetRunningServiceByUser(ctx.User.ID)
-		if err != nil {
-			ctx.ServerError("GetRunningServiceByUser", err)
-			return
-		}
-		if deployments != nil {
-			if len(deployments) > 0 {
-				ctx.Data["Err_RepoName"] = nil
-				log.Error("盘古部署删除项目失败,repo id %v, 用户 id%v", repo.ID, ctx.User.ID)
-				ctx.Flash.Error(ctx.Tr("deployment.deletion_notice_repo"))
-				ctx.Redirect(ctx.Repo.RepoLink + "/settings")
-				return
+
+		// finetune: openi-notebook repo can not be deleted if it has running service
+		if repo.Name == "openi-notebook" {
+			if deployments, err := models.GetRunningServiceByUser(ctx.User.ID); deployments != nil && err == nil {
+				if len(deployments) > 0 {
+					ctx.Data["Err_RepoName"] = nil
+					log.Error("panguService: delete repo failed, repo %s, user %s", repo.ID, ctx.User.ID)
+					ctx.Flash.Error(ctx.Tr("deployment.deletion_notice_repo"))
+					ctx.Redirect(ctx.Repo.RepoLink + "/settings")
+					return
+				}
 			}
 		}
+
 		count, err := models.GetCloudbrainRunCountByRepoID(repo.ID)
 		if err != nil {
 			ctx.ServerError("GetCloudbrainCountByRepoID failed", err)

services/cloudbrain/clear.go

@@ -15,6 +15,11 @@ import (
 )
 
 func ClearCloudbrainResultSpace() {
+	defer func() {
+		if err := recover(); err != nil {
+			log.Error("panic occurred:", err)
+		}
+	}()
 	log.Info("clear cloudbrain one result space begin.")
 	if !setting.ClearStrategy.Enabled {
 		return