From 71969f36d6905ed37e180e74b244db860fd6ecff Mon Sep 17 00:00:00 2001 From: v-kkhuang <420895376@qq.com> Date: Tue, 3 Feb 2026 15:28:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?#AI=20commit#=20=E5=BC=80=E5=8F=91=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=EF=BC=9A=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=BC=BA=20-=20?= =?UTF-8?q?=E5=B1=8F=E8=94=BDYRAN=20apps=E6=8E=A5=E5=8F=A3=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/rm/external/yarn/YarnResourceRequester.java | 4 +++- .../apache/linkis/manager/common/conf/RMConfiguration.java | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/rm/external/yarn/YarnResourceRequester.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/rm/external/yarn/YarnResourceRequester.java index 9a84cb708c..5f00f584d4 100644 --- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/rm/external/yarn/YarnResourceRequester.java +++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/rm/external/yarn/YarnResourceRequester.java @@ -349,7 +349,9 @@ public List requestAppInfo( + "&states=" + YarnAppState.RUNNING.getState() + "," - + YarnAppState.ACCEPTED.getState(); + + YarnAppState.ACCEPTED.getState() + + "&deSelects=" + + RMConfiguration.YARN_APPS_FILTER_DESELECT.getValue(); resp = getResponseByUrl("apps" + queryParams, rmWebAddress, provider).path("apps").path("app"); } else { diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/conf/RMConfiguration.java b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/conf/RMConfiguration.java index e8f9f530eb..70156a24a6 100644 --- a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/conf/RMConfiguration.java +++ b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/conf/RMConfiguration.java @@ -91,4 +91,9 @@ public class RMConfiguration { public static final CommonVars YARN_APPS_FILTER_ENABLED = CommonVars.apply("wds.linkis.rm.yarn.apps.filter.enabled", true); + + public static final CommonVars YARN_APPS_FILTER_DESELECT = + CommonVars.apply( + "wds.linkis.rm.yarn.apps.deselect.word", + "resourceRequests,timeouts,appNodeLabelExpression,amNodeLabelExpression,resourceInfo"); } From bd8e7034e09e0ac5364a1c78c06f6d8efb94108a Mon Sep 17 00:00:00 2001 From: v-kkhuang <420895376@qq.com> Date: Tue, 3 Feb 2026 15:36:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?#AI=20commit#=20=E5=BC=80=E5=8F=91=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=EF=BC=9A=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=BC=BA=20-=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96apps=E8=BF=87=E6=BB=A4=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/rm/external/yarn/YarnResourceRequester.java | 3 +-- .../apache/linkis/manager/common/conf/RMConfiguration.java | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/rm/external/yarn/YarnResourceRequester.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/rm/external/yarn/YarnResourceRequester.java index 5f00f584d4..110f58e632 100644 --- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/rm/external/yarn/YarnResourceRequester.java +++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/rm/external/yarn/YarnResourceRequester.java @@ -350,8 +350,7 @@ public List requestAppInfo( + YarnAppState.RUNNING.getState() + "," + YarnAppState.ACCEPTED.getState() - + "&deSelects=" - + RMConfiguration.YARN_APPS_FILTER_DESELECT.getValue(); + + RMConfiguration.YARN_APPS_FILTER_PARMS.getValue(); resp = getResponseByUrl("apps" + queryParams, rmWebAddress, provider).path("apps").path("app"); } else { diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/conf/RMConfiguration.java b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/conf/RMConfiguration.java index 70156a24a6..78065d7b4b 100644 --- a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/conf/RMConfiguration.java +++ b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/conf/RMConfiguration.java @@ -92,8 +92,8 @@ public class RMConfiguration { public static final CommonVars YARN_APPS_FILTER_ENABLED = CommonVars.apply("wds.linkis.rm.yarn.apps.filter.enabled", true); - public static final CommonVars YARN_APPS_FILTER_DESELECT = + public static final CommonVars YARN_APPS_FILTER_PARMS = CommonVars.apply( - "wds.linkis.rm.yarn.apps.deselect.word", - "resourceRequests,timeouts,appNodeLabelExpression,amNodeLabelExpression,resourceInfo"); + "wds.linkis.rm.yarn.apps.filter.parms", + "&deSelects=resourceRequests,timeouts,appNodeLabelExpression,amNodeLabelExpression,resourceInfo"); }