modules/modelarts/resty.go

@@ -39,7 +39,9 @@ const (
 	NotebookInvalid       = "ModelArts.6400"
 	UnknownErrorPrefix    = "UNKNOWN:"
 
-	ModelArtsJobNotExists = "ModelArts.0102"
+	ModelArtsJobInTargetState = "ModelArts.6357"
+	ModelArtsJobNotExists     = "ModelArts.0102"
+	ModelArtsJobInternalError = "ModelArts.0010"
 )
 
 func getRestyClient() *resty.Client {
@@ -395,8 +397,12 @@ sendjob:
 			_ = getToken()
 			goto sendjob
 		}
-		if response.ErrorCode == ModelArtsJobNotExists {
-			//任务不存在，此时认为删除成功
+		if response.ErrorCode == ModelArtsJobNotExists || response.ErrorCode == ModelArtsJobInTargetState {
+			//任务不存在或者已经处于被删除的状态，此时认为删除成功
+			return &models.NotebookDelResult{}, nil
+		}
+		if result.ErrorCode == ModelArtsJobInternalError {
+			log.Error("ModelArt internal error when del job,jobId=%s", jobID)
 			return &models.NotebookDelResult{}, nil
 		}
 		return &result, fmt.Errorf("DelNotebook2 failed(%s): %s", response.ErrorCode, response.ErrorMsg)
@@ -1052,8 +1058,12 @@ sendjob:
 			return &result, fmt.Errorf("json.Unmarshal failed(%s): %v", res.String(), err.Error())
 		}
 		log.Error("DelTrainJob failed(%d):%s(%s)", res.StatusCode(), temp.ErrorCode, temp.ErrorMsg)
-		if temp.ErrorCode == ModelArtsJobNotExists {
-			//任务不存在，此时认为删除成功
+		if temp.ErrorCode == ModelArtsJobNotExists || temp.ErrorCode == ModelArtsJobInTargetState {
+			//任务不存在或者已经处于被删除的状态，此时认为删除成功
+			return &models.TrainJobResult{IsSuccess: true}, nil
+		}
+		if result.ErrorCode == ModelArtsJobInternalError {
+			log.Error("ModelArt internal error when del job,jobId=%s", jobID)
 			return &models.TrainJobResult{IsSuccess: true}, nil
 		}
 		return &result, fmt.Errorf("删除训练作业失败(%d):%s(%s)", res.StatusCode(), temp.ErrorCode, temp.ErrorMsg)
@@ -1061,8 +1071,12 @@ sendjob:
 
 	if !result.IsSuccess {
 		log.Error("DelTrainJob(%s) failed", jobID)
-		if result.ErrorCode == ModelArtsJobNotExists {
-			//任务不存在，此时认为删除成功
+		if result.ErrorCode == ModelArtsJobNotExists || result.ErrorCode == ModelArtsJobInTargetState {
+			//任务不存在或者已经处于被删除的状态，此时认为删除成功
+			return &models.TrainJobResult{IsSuccess: true}, nil
+		}
+		if result.ErrorCode == ModelArtsJobInternalError {
+			log.Error("ModelArt internal error when del job,jobId=%s", jobID)
 			return &models.TrainJobResult{IsSuccess: true}, nil
 		}
 		return &result, fmt.Errorf("删除训练作业失败:%s", result.ErrorMsg)
@@ -1141,6 +1155,15 @@ sendjob:
 			log.Error("json.Unmarshal failed(%s): %v", res.String(), err.Error())
 			return &result, fmt.Errorf("json.Unmarshal failed(%s): %v", res.String(), err.Error())
 		}
+
+		if temp.ErrorCode == ModelArtsJobNotExists || temp.ErrorCode == ModelArtsJobInTargetState {
+			//任务不存在或者已经处于被删除的状态，此时认为删除成功
+			return &models.TrainJobResult{IsSuccess: true}, nil
+		}
+		if result.ErrorCode == ModelArtsJobInternalError {
+			log.Error("ModelArt internal error when del job,jobId=%s", jobID)
+			return &models.TrainJobResult{IsSuccess: true}, nil
+		}
 		log.Error("DelTrainJob failed(%d):%s(%s)", res.StatusCode(), temp.ErrorCode, temp.ErrorMsg)
 		return &result, fmt.Errorf("删除训练作业版本失败(%d):%s(%s)", res.StatusCode(), temp.ErrorCode, temp.ErrorMsg)
 	}

modules/modelarts_cd/resty.go

@@ -29,12 +29,14 @@ const (
 	urlNotebook2 = "/notebooks"
 
 	//error code
-	modelartsIllegalToken = "ModelArts.6401"
-	NotebookNotFound      = "ModelArts.6404"
-	NotebookNoPermission  = "ModelArts.6407"
-	NotebookInvalid       = "ModelArts.6400"
-	UnknownErrorPrefix    = "UNKNOWN:"
-	ModelArtsJobNotExists = "ModelArts.0102"
+	modelartsIllegalToken     = "ModelArts.6401"
+	NotebookNotFound          = "ModelArts.6404"
+	NotebookNoPermission      = "ModelArts.6407"
+	NotebookInvalid           = "ModelArts.6400"
+	UnknownErrorPrefix        = "UNKNOWN:"
+	ModelArtsJobNotExists     = "ModelArts.0102"
+	ModelArtsJobInTargetState = "ModelArts.6357"
+	ModelArtsJobInternalError = "ModelArts.0010"
 )
 
 func getHttpClient() *http.Client {
@@ -168,8 +170,13 @@ func DelNotebook(jobID string) (*models.NotebookDelResult, error) {
 
 	if len(result.ErrorCode) != 0 {
 		log.Error("DelNotebook2 failed(%s): %s", result.ErrorCode, result.ErrorMsg)
-		if result.ErrorCode == ModelArtsJobNotExists {
-			//任务不存在，此时认为删除成功
+		if result.ErrorCode == ModelArtsJobNotExists || result.ErrorCode == ModelArtsJobInTargetState {
+			//任务不存在或者已经处于被删除的状态，此时认为删除成功
+			return &models.NotebookDelResult{}, nil
+		}
+
+		if result.ErrorCode == ModelArtsJobInternalError {
+			log.Error("ModelArt internal error when del job,jobId=%s", jobID)
 			return &models.NotebookDelResult{}, nil
 		}
 		return &result, fmt.Errorf("DelNotebook2 failed(%s): %s", result.ErrorCode, result.ErrorMsg)