add cross cluster rule error

WeDataSphere · Aug 31, 2023 · 72284ee · 72284ee
1 parent 5f3a4ba
commit 72284ee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/...application-manager/src/main/java/org/apache/linkis/manager/rm/exception/RMErrorCode.java b/...application-manager/src/main/java/org/apache/linkis/manager/rm/exception/RMErrorCode.java
@@ -61,6 +61,8 @@ public enum RMErrorCode implements LinkisErrorCode {
 
   CLUSTER_QUEUE_INSTANCES_INSUFFICIENT(12012, "Insufficient cluster queue instance(集群队列实例不足)"),
 
+  ACROSS_CLUSTER_RULE_FAILED(12012, "across cluster rule failed(跨集群规则失败)"),
+
   ECM_RESOURCE_INSUFFICIENT(11000, "ECM resources are insufficient(ECM 资源不足)"),
 
   ECM_MEMORY_INSUFFICIENT(11001, "ECM memory resources are insufficient(ECM 内存资源不足)"),

diff --git a/...ain/scala/org/apache/linkis/manager/rm/service/impl/DriverAndYarnReqResourceService.scala b/...ain/scala/org/apache/linkis/manager/rm/service/impl/DriverAndYarnReqResourceService.scala
@@ -114,12 +114,8 @@ class DriverAndYarnReqResourceService(
 
         if (!acrossClusterFlag) {
           logger.info(s"user: $user, creator: $creator task not meet the threshold rule")
-          logger.info(
-            s"requestedYarnResource: $requestedYarnResource, queueLeftResource: $queueLeftResource, maxCapacity: $maxCapacity"
-          )
-          val notEnoughMessage =
-            generateQueueNotEnoughMessage(requestedYarnResource, queueLeftResource, maxCapacity)
-          throw new RMWarnException(notEnoughMessage._1, notEnoughMessage._2)
+
+          throw new RMWarnException(RMErrorCode.ACROSS_CLUSTER_RULE_FAILED.getErrorCode, RMErrorCode.ACROSS_CLUSTER_RULE_FAILED.getErrorDesc)
         }
 
         logger.info(s"user: $user, creator: $creator task meet the threshold rule")