feat: root.xxx适配 (#678)

* feat: kill reason && queue support root.xxx * Revert "feat: kill reason && queue support root.xxx" This reverts commit 50113f5. * feat: queue support root.xxx * feat: queue support root.xxx * feat: queue support root.xxx * fix: deal conflicts
WeDataSphere · Dec 13, 2024 · 84df21e · 84df21e
1 parent f6da992
commit 84df21e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/...nager/src/main/java/org/apache/linkis/manager/rm/external/yarn/YarnResourceRequester.java b/...nager/src/main/java/org/apache/linkis/manager/rm/external/yarn/YarnResourceRequester.java
@@ -17,6 +17,7 @@
 
 package org.apache.linkis.manager.rm.external.yarn;
 
+import org.apache.linkis.engineplugin.server.conf.EngineConnPluginConfiguration;
 import org.apache.linkis.manager.common.entity.resource.CommonNodeResource;
 import org.apache.linkis.manager.common.entity.resource.NodeResource;
 import org.apache.linkis.manager.common.entity.resource.ResourceType;
@@ -57,6 +58,7 @@ public class YarnResourceRequester implements ExternalResourceRequester {
   private final String HASTATE_ACTIVE = "active";
   private static final ObjectMapper objectMapper = new ObjectMapper();
   private final Map<String, String> rmAddressMap = new ConcurrentHashMap<>();
+  private final String queuePrefix = EngineConnPluginConfiguration.QUEUE_PREFIX().getValue();
 
   private static final HttpClient httpClient = HttpClients.createDefault();
 
@@ -74,7 +76,11 @@ public NodeResource requestResourceInfo(
     logger.info("rmWebAddress: " + rmWebAddress);
 
     String queueName = ((YarnResourceIdentifier) identifier).getQueueName();
-    String realQueueName = "root." + queueName;
+    if (queueName.startsWith(queuePrefix)) {
+      logger.info("Queue name {} starts with '{}', remove '{}'", queueName, queuePrefix, queuePrefix);
+      queueName = queueName.substring(queuePrefix.length());
+    }
+    String realQueueName = queuePrefix + queueName;
 
     try {
       YarnQueueInfo resources = getResources(rmWebAddress, realQueueName, queueName, provider);
@@ -301,7 +307,7 @@ public List<ExternalAppInfo> requestAppInfo(
     String rmWebAddress = getAndUpdateActiveRmWebAddress(provider);
 
     String queueName = ((YarnResourceIdentifier) identifier).getQueueName();
-    String realQueueName = "root." + queueName;
+    String realQueueName = queuePrefix + queueName;
 
     JsonNode resp = getResponseByUrl("apps", rmWebAddress, provider).path("apps").path("app");
     if (resp.isMissingNode()) {

diff --git a/...main/scala/org/apache/linkis/engineplugin/server/conf/EngineConnPluginConfiguration.scala b/...main/scala/org/apache/linkis/engineplugin/server/conf/EngineConnPluginConfiguration.scala
@@ -39,4 +39,7 @@ object EngineConnPluginConfiguration {
   val EC_BML_VERSION_MAY_WITH_PREFIX_V: CommonVars[Boolean] =
     CommonVars("linkis.engineconn.bml.version.may.with.prefix", true)
 
+  val QUEUE_PREFIX: CommonVars[String] =
+    CommonVars("wds.linkis.queue.prefix", "root.")
+
 }