From b51e1c0aa8501404bebbc954eb6d81316c74a781 Mon Sep 17 00:00:00 2001 From: Sunil G Date: Fri, 16 Aug 2019 11:53:47 +0530 Subject: [PATCH] YARN-2599 --- .../test/java/org/apache/hadoop/yarn/client/TestRMFailover.java | 7 ++++--- .../hadoop/yarn/server/resourcemanager/webapp/RMWebAppFilter.java | 2 +- 2 files changed, 5 insertions(+), 4 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 8d9a1b88ac7..25377f1672a 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 @@ -294,10 +294,8 @@ public void testRMWebAppRedirect() throws YarnException, 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, + // standby RM links /conf, /stacks, /logLevel, /static, /logs, /jmx // /cluster/cluster as well as webService // /ws/v1/cluster/info should not be redirected to active RM redirectURL = getRedirectURL(rm2Url + "/cluster/cluster"); @@ -318,6 +316,9 @@ public void testRMWebAppRedirect() throws YarnException, redirectURL = getRedirectURL(rm2Url + "/logs"); assertNull(redirectURL); + redirectURL = getRedirectURL(rm2Url + "/jmx?param1=value1+x¶m2=y"); + 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 40b383478cc..5adbe2dca1f 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 @@ -69,7 +69,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", IsActiveServlet.PATH_SPEC); + "/conf", "/stacks", "/logLevel", "/logs", IsActiveServlet.PATH_SPEC, "/jmx"); private String path; private boolean ahsEnabled; private String ahsPageURLPrefix; -- 2.15.0