fix-712 删除项目或账号后自动停止云脑训练任务

models/cloudbrain.go

@@ -1007,13 +1007,13 @@ func GetCloudbrainByJobIDAndIsLatestVersion(jobID string, isLatestVersion string
 
 func GetCloudbrainsNeededStopByUserID(userID int64) ([]*Cloudbrain, error) {
 	cloudBrains := make([]*Cloudbrain, 0)
-	err := x.Cols("job_id", "status", "type").Where("user_id=? AND status !=?", userID, string(JobStopped)).Find(&cloudBrains)
+	err := x.Cols("job_id", "status", "type", "job_type", "version_id").Where("user_id=? AND status !=?", userID, string(JobStopped)).Find(&cloudBrains)
 	return cloudBrains, err
 }
 
 func GetCloudbrainsNeededStopByRepoID(repoID int64) ([]*Cloudbrain, error) {
 	cloudBrains := make([]*Cloudbrain, 0)
-	err := x.Cols("job_id", "status", "type").Where("repo_id=? AND status !=?", repoID, string(JobStopped)).Find(&cloudBrains)
+	err := x.Cols("job_id", "status", "type", "job_type", "version_id").Where("repo_id=? AND status !=?", repoID, string(JobStopped)).Find(&cloudBrains)
 	return cloudBrains, err
 }
 

routers/repo/cloudbrain.go

@@ -437,14 +437,22 @@ func StopJobs(cloudBrains []*models.Cloudbrain) {
 
 			logErrorAndUpdateJobStatus(err, taskInfo)
 		} else {
-			param := models.NotebookAction{
-				Action: models.ActionStop,
+			if taskInfo.JobType == string(models.JobTypeTrain) {
+				err := retry(3, time.Second*30, func() error {
+					_, err := modelarts.StopTrainJob(taskInfo.JobID, strconv.FormatInt(taskInfo.VersionID, 10))
+					return err
+				})
+				logErrorAndUpdateJobStatus(err, taskInfo)
+			} else {
+				param := models.NotebookAction{
+					Action: models.ActionStop,
+				}
+				err := retry(3, time.Second*30, func() error {
+					_, err := modelarts.StopJob(taskInfo.JobID, param)
+					return err
+				})
+				logErrorAndUpdateJobStatus(err, taskInfo)
 			}
-			err := retry(3, time.Second*30, func() error {
-				_, err := modelarts.StopJob(taskInfo.JobID, param)
-				return err
-			})
-			logErrorAndUpdateJobStatus(err, taskInfo)
 		}
 
 	}