You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aa...@apache.org on 2021/09/29 06:48:21 UTC
[hadoop] branch branch-3.3 updated: YARN-10970. Standby RM should
expose prom endpoint (#3480)
This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new 88deac0 YARN-10970. Standby RM should expose prom endpoint (#3480)
88deac0 is described below
commit 88deac0479008636ac3380b8e75b2baa2d44e1ec
Author: Neil <wx...@foxmail.com>
AuthorDate: Wed Sep 29 14:46:55 2021 +0800
YARN-10970. Standby RM should expose prom endpoint (#3480)
Reviewed-by: Adam Antal <ad...@apache.org>
Signed-off-by: Akira Ajisaka <aa...@apache.org>
(cherry picked from commit 4bd0c36189f6859e3b0fde922fd8b25d0c756233)
---
.../src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java | 5 ++++-
.../hadoop/yarn/server/resourcemanager/webapp/RMWebAppFilter.java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java
index 6eae898..d9f6d4e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java
@@ -295,7 +295,7 @@ public class TestRMFailover extends ClientBaseWithFixes {
assertEquals(redirectURL,rm1Url + "/metrics");
- // standby RM links /conf, /stacks, /logLevel, /static, /logs, /jmx
+ // standby RM links /conf, /stacks, /logLevel, /static, /logs, /jmx, /prom
// /cluster/cluster as well as webService
// /ws/v1/cluster/info should not be redirected to active RM
redirectURL = getRedirectURL(rm2Url + "/cluster/cluster");
@@ -319,6 +319,9 @@ public class TestRMFailover extends ClientBaseWithFixes {
redirectURL = getRedirectURL(rm2Url + "/jmx?param1=value1+x¶m2=y");
assertNull(redirectURL);
+ redirectURL = getRedirectURL(rm2Url + "/prom");
+ assertNull(redirectURL);
+
redirectURL = getRedirectURL(rm2Url + "/ws/v1/cluster/info");
assertNull(redirectURL);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebAppFilter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebAppFilter.java
index ce0f90a..3d6d694 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebAppFilter.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebAppFilter.java
@@ -70,7 +70,7 @@ public class RMWebAppFilter extends GuiceContainer {
// define a set of URIs which do not need to do redirection
private static final Set<String> NON_REDIRECTED_URIS = Sets.newHashSet(
"/conf", "/stacks", "/logLevel", "/logs", IsActiveServlet.PATH_SPEC,
- "/jmx");
+ "/jmx", "/prom");
private String path;
private boolean ahsEnabled;
private String ahsPageURLPrefix;
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org