From a353739f1531fa131bd73c825578ba5bc6b4dca0 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Thu, 5 Jan 2023 15:20:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/cloudbrain.go            |  8 ++++----
 options/locale/locale_en-US.ini |  2 ++
 options/locale/locale_zh-CN.ini |  2 ++
 routers/repo/grampus.go         |  4 ++++
 services/cloudbrain/clear.go    | 28 ++++++++++++++--------------
 5 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/models/cloudbrain.go b/models/cloudbrain.go
index 7b19c120d..c721e473c 100755
--- a/models/cloudbrain.go
+++ b/models/cloudbrain.go
@@ -2172,7 +2172,7 @@ func GetCloudBrainUnStoppedJob() ([]*Cloudbrain, error) {
 		Find(&cloudbrains)
 }
 
-func GetCloudBrainOneStoppedNotDebugJobDaysAgo(days int, limit int) ([]*Cloudbrain, error) {
+func GetGPUStoppedNotDebugJobDaysAgo(days int, limit int) ([]*Cloudbrain, error) {
 	cloudbrains := make([]*Cloudbrain, 0, 10)
 	endTimeBefore := time.Now().Unix() - int64(days)*24*3600
 	missEndTimeBefore := endTimeBefore - 24*3600
@@ -2181,7 +2181,7 @@ func GetCloudBrainOneStoppedNotDebugJobDaysAgo(days int, limit int) ([]*Cloudbra
 			JobStopped, JobSucceeded, JobFailed, ModelArtsCreateFailed, ModelArtsStartFailed, ModelArtsUnavailable, ModelArtsResizFailed, ModelArtsDeleted,
 			ModelArtsStopped, ModelArtsTrainJobCanceled, ModelArtsTrainJobCheckFailed, ModelArtsTrainJobCompleted, ModelArtsTrainJobDeleteFailed, ModelArtsTrainJobDeployServiceFailed,
 			ModelArtsTrainJobFailed, ModelArtsTrainJobImageFailed, ModelArtsTrainJobKilled, ModelArtsTrainJobLost, ModelArtsTrainJobSubmitFailed, ModelArtsTrainJobSubmitModelFailed).
-		Where("(((end_time is null or end_time=0) and updated_unix<? and updated_unix != 0 ) or (end_time<? and end_time != 0)) and cleared=false and type=0 and job_type != 'DEBUG'", missEndTimeBefore, endTimeBefore).
+		Where("(((end_time is null or end_time=0) and updated_unix<? and updated_unix != 0 ) or (end_time<? and end_time != 0)) and cleared=false and (type=0 or (type =2 and compute_resource='CPU/GPU')) and job_type != 'DEBUG'", missEndTimeBefore, endTimeBefore).
 		Limit(limit).
 		Find(&cloudbrains)
 }
@@ -2189,14 +2189,14 @@ func GetCloudBrainOneStoppedNotDebugJobDaysAgo(days int, limit int) ([]*Cloudbra
 /**
   本方法考虑了再次调试的情况，多次调试取最后一次的任务的结束时间
 */
-func GetCloudBrainOneStoppedDebugJobDaysAgo(days int, limit int) ([]*Cloudbrain, error) {
+func GetGPUStoppedDebugJobDaysAgo(days int, limit int) ([]*Cloudbrain, error) {
 	cloudbrains := make([]*Cloudbrain, 0, 10)
 	endTimeBefore := time.Now().Unix() - int64(days)*24*3600
 	missEndTimeBefore := endTimeBefore - 24*3600
 	sql := `SELECT id,job_name,job_id from (SELECT DISTINCT ON (job_name)
         id, job_name, job_id,status,end_time,updated_unix,cleared
         FROM   cloudbrain
-        where type=0 and job_type='DEBUG'
+        where (type=0 or (type =2 and compute_resource='CPU/GPU')) and job_type='DEBUG'
         ORDER  BY job_name, updated_unix DESC) a
         where status in ('STOPPED','SUCCEEDED','FAILED') and (((end_time is null or end_time=0) and updated_unix<? and updated_unix != 0 ) or (end_time<? and end_time != 0)) and cleared=false`
 
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index f05ea5799..847b18f74 100755
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1063,6 +1063,8 @@ notebook_file_not_exist=Notebook file does not exist.
 notebook_select_wrong=Please select a Notebook(.ipynb) file first.
 notebook_file_no_right=You have no right to access the Notebook(.ipynb) file.
 notebook_repo_conflict=The files in different branches of the same repository can not run together.
+debug_again_fail=Fail to restart debug task, please try again later.
+debug_again_fail_forever=The task was scheduled failed last time, can not restart.
 
 date=Date
 repo_add=Project Increment
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index f08665431..aac79cdf5 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -1062,6 +1062,8 @@ notebook_file_not_exist=Notebook文件不存在。
 notebook_select_wrong=请先选择Notebook（.ipynb）文件。
 notebook_file_no_right=您没有这个Notebook文件的读权限。
 notebook_repo_conflict=同一个仓库的不同分支文件不能同时运行。
+debug_again_fail=再次调试失败，请稍后再试。
+debug_again_fail_forever=这个任务之前没有调度成功，不能再次调试。
 
 date=日期
 repo_add=新增项目
diff --git a/routers/repo/grampus.go b/routers/repo/grampus.go
index fac4c5c36..319001d9f 100755
--- a/routers/repo/grampus.go
+++ b/routers/repo/grampus.go
@@ -1682,6 +1682,10 @@ func GrampusNotebookRestart(ctx *context.Context) {
 		if res.GrampusResult.ErrorCode != 0 || res.NewId == "" {
 			log.Error("ManageNotebook2 failed:" + res.GrampusResult.ErrorMsg)
 			errorMsg = ctx.Tr("repo.debug_again_fail")
+			if res.GrampusResult.ErrorCode == 5005 {
+				errorMsg = ctx.Tr("repo.debug_again_fail_forever")
+			}
+
 			break
 		}
 
diff --git a/services/cloudbrain/clear.go b/services/cloudbrain/clear.go
index 44613ee3c..e14414c74 100644
--- a/services/cloudbrain/clear.go
+++ b/services/cloudbrain/clear.go
@@ -14,21 +14,21 @@ import (
 
 func ClearCloudbrainResultSpace() {
 	log.Info("clear cloudbrain one result space begin.")
-	if !setting.ClearStrategy.Enabled{
+	if !setting.ClearStrategy.Enabled {
 		return
 	}
 
-	tasks, err := models.GetCloudBrainOneStoppedNotDebugJobDaysAgo(setting.ClearStrategy.ResultSaveDays, setting.ClearStrategy.BatchSize)
+	tasks, err := models.GetGPUStoppedNotDebugJobDaysAgo(setting.ClearStrategy.ResultSaveDays, setting.ClearStrategy.BatchSize)
 	if err != nil {
 		log.Warn("Failed to get cloudbrain, clear result failed.", err)
 		return
 	}
-	debugTasks, err := models.GetCloudBrainOneStoppedDebugJobDaysAgo(setting.ClearStrategy.ResultSaveDays, setting.ClearStrategy.DebugJobSize)
+	debugTasks, err := models.GetGPUStoppedDebugJobDaysAgo(setting.ClearStrategy.ResultSaveDays, setting.ClearStrategy.DebugJobSize)
 	if err != nil {
 		log.Warn("Failed to get debug cloudbrain.", err)
 
 	}
-	tasks=append(tasks,debugTasks...)
+	tasks = append(tasks, debugTasks...)
 
 	if err != nil {
 		log.Warn("Failed to get cloudbrain, clear result failed.", err)
@@ -38,7 +38,7 @@ func ClearCloudbrainResultSpace() {
 	for _, task := range tasks {
 		err := DeleteCloudbrainOneJobStorage(task.JobName)
 		if err == nil {
-			log.Info("clear job in cloudbrain table:"+task.JobName)
+			log.Info("clear job in cloudbrain table:" + task.JobName)
 			ids = append(ids, task.ID)
 		}
 	}
@@ -69,10 +69,10 @@ func clearMinioHistoryTrashFile() {
 		SortModTimeAscend(miniofiles)
 		for _, file := range miniofiles {
 
-			if file.Name()!="" && file.ModTime().Before(time.Now().AddDate(0, 0, -setting.ClearStrategy.TrashSaveDays)) {
+			if file.Name() != "" && file.ModTime().Before(time.Now().AddDate(0, 0, -setting.ClearStrategy.TrashSaveDays)) {
 
-				has,err:=models.IsCloudbrainExistByJobName(file.Name())
-				if err==nil && !has {
+				has, err := models.IsCloudbrainExistByJobName(file.Name())
+				if err == nil && !has {
 					dirPath := setting.CBCodePathPrefix + file.Name() + "/"
 					log.Info("clear job in minio trash:" + file.Name())
 					storage.Attachments.DeleteDir(dirPath)
@@ -90,7 +90,7 @@ func clearMinioHistoryTrashFile() {
 	}
 }
 
-func clearLocalHistoryTrashFile()  {
+func clearLocalHistoryTrashFile() {
 	files, err := ioutil.ReadDir(setting.JobPath)
 	processCount := 0
 	if err != nil {
@@ -99,11 +99,11 @@ func clearLocalHistoryTrashFile()  {
 		SortModTimeAscend(files)
 		for _, file := range files {
 			//清理n天前的历史垃圾数据，清理job目录
-			if file.Name()!="" && file.ModTime().Before(time.Now().AddDate(0, 0, -setting.ClearStrategy.TrashSaveDays)) {
-				has,err:=models.IsCloudbrainExistByJobName(file.Name())
-				if err==nil && !has{
+			if file.Name() != "" && file.ModTime().Before(time.Now().AddDate(0, 0, -setting.ClearStrategy.TrashSaveDays)) {
+				has, err := models.IsCloudbrainExistByJobName(file.Name())
+				if err == nil && !has {
 					os.RemoveAll(setting.JobPath + file.Name())
-					log.Info("clear job in local trash:"+file.Name())
+					log.Info("clear job in local trash:" + file.Name())
 					processCount++
 				}
 				if processCount == setting.ClearStrategy.BatchSize {
@@ -127,7 +127,7 @@ func SortModTimeAscend(files []os.FileInfo) {
 
 func DeleteCloudbrainOneJobStorage(jobName string) error {
 
-	if jobName==""{
+	if jobName == "" {
 		return nil
 	}
 	//delete local