Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-10970. Standby RM should expose prom endpoint (#3480) 

Reviewed-by: Adam Antal <adamantal@apache.org>
Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
(cherry picked from commit 4bd0c36189)
This commit is contained in:
Neil 2021-09-29 14:46:55 +08:00 committed by Akira Ajisaka
parent f00ab40b4d
commit 88deac0479
No known key found for this signature in database
GPG Key ID: C1EDBB9CA400FD50
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java
View File

@ -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&param2=y");
assertNull(redirectURL);
redirectURL = getRedirectURL(rm2Url + "/prom");
assertNull(redirectURL);
redirectURL = getRedirectURL(rm2Url + "/ws/v1/cluster/info");
assertNull(redirectURL);

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebAppFilter.java
View File

@ -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;