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 b58a775..5275560 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 @@ -270,14 +270,8 @@ public void testRMWebAppRedirect() throws YarnException, // if uri is null, RMWebAppFilter will append a slash at the trail of the redirection url assertEquals(redirectURL,rm1Url+"/"); - redirectURL = getRedirectURL(rm2Url + "/metrics"); - assertEquals(redirectURL,rm1Url + "/metrics"); - - redirectURL = getRedirectURL(rm2Url + "/jmx?param1=value1+x¶m2=y"); - assertEquals(rm1Url + "/jmx?param1=value1+x¶m2=y", redirectURL); - - // standby RM links /conf, /stacks, /logLevel, /static, /logs, - // /cluster/cluster as well as webService + // standby RM links /conf, /stacks, /logLevel, /metrics, /jmx, /static, + // /logs, /cluster/cluster as well as webService // /ws/v1/cluster/info should not be redirected to active RM redirectURL = getRedirectURL(rm2Url + "/cluster/cluster"); assertNull(redirectURL); @@ -291,6 +285,12 @@ public void testRMWebAppRedirect() throws YarnException, redirectURL = getRedirectURL(rm2Url + "/logLevel"); assertNull(redirectURL); + redirectURL = getRedirectURL(rm2Url + "/metrics"); + assertNull(redirectURL); + + redirectURL = getRedirectURL(rm2Url + "/jmx?param1=value1+x¶m2=y"); + assertNull(redirectURL); + redirectURL = getRedirectURL(rm2Url + "/static"); 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 1e4caba..46fa229 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 @@ -68,7 +68,7 @@ // define a set of URIs which do not need to do redirection private static final Set NON_REDIRECTED_URIS = Sets.newHashSet( - "/conf", "/stacks", "/logLevel", "/logs"); + "/conf", "/stacks", "/logLevel", "/logs", "/metrics", "/jmx"); private String path; private boolean ahsEnabled; private String ahsPageURLPrefix;