[hadoop] branch trunk updated: YARN-2599. Standby RM should expose jmx endpoint. Contributed by Rohith Sharma K S.

[su...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sunilg pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 0e0ddfa  YARN-2599. Standby RM should expose jmx endpoint. Contributed by Rohith Sharma K S.
0e0ddfa is described below

commit 0e0ddfaf242cf2c66b3ab95de919efecb1137505
Author: Sunil G <su...@apache.org>
AuthorDate: Sat Aug 17 15:43:19 2019 +0530

    YARN-2599. Standby RM should expose jmx endpoint. Contributed by Rohith Sharma K S.
---
 .../test/java/org/apache/hadoop/yarn/client/TestRMFailover.java    | 7 ++++---
 .../hadoop/yarn/server/resourcemanager/webapp/RMWebAppFilter.java  | 5 +++--
 2 files changed, 7 insertions(+), 5 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 8d9a1b8..25377f1 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 class TestRMFailover extends ClientBaseWithFixes {
     redirectURL = getRedirectURL(rm2Url + "/metrics");
     assertEquals(redirectURL,rm1Url + "/metrics");
 
-    redirectURL = getRedirectURL(rm2Url + "/jmx?param1=value1+x&param2=y");
-    assertEquals(rm1Url + "/jmx?param1=value1+x&param2=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 class TestRMFailover extends ClientBaseWithFixes {
     redirectURL = getRedirectURL(rm2Url + "/logs");
     assertNull(redirectURL);
 
+    redirectURL = getRedirectURL(rm2Url + "/jmx?param1=value1+x&param2=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 40b3834..d197be4 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,8 @@ 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);
+      "/conf", "/stacks", "/logLevel", "/logs", IsActiveServlet.PATH_SPEC,
+      "/jmx");
   private String path;
   private boolean ahsEnabled;
   private String ahsPageURLPrefix;
@@ -274,4 +275,4 @@ public class RMWebAppFilter extends GuiceContainer {
     long baseTime = BASIC_SLEEP_TIME * (1L << retries);
     return (int) (baseTime * (randnum.nextDouble() + 0.5));
   }
-}
\ No newline at end of file
+}


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org