You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yarn-commits@hadoop.apache.org by ac...@apache.org on 2014/04/05 04:52:41 UTC
svn commit: r1584956 - in
/hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn:
hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/
hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/ser...
Author: acmurthy
Date: Sat Apr 5 02:52:41 2014
New Revision: 1584956
URL: http://svn.apache.org/r1584956
Log:
Merge -c 1584954 from trunk to branch-2.4 to fix YARN-1898. Addendum patch to ensure /jmx and /metrics are re-directed to Active RM.
Modified:
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebAppFilter.java
Modified: hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java?rev=1584956&r1=1584955&r2=1584956&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java (original)
+++ hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java Sat Apr 5 02:52:41 2014
@@ -270,8 +270,14 @@ public class TestRMFailover extends Clie
String header = getHeader("Refresh", rm2Url);
assertTrue(header.contains("; url=" + rm1Url));
- // standby RM links /conf, /stacks, /logLevel, /metrics, /jmx,
- // /static, /logs, /cluster/cluster as well as webService
+ header = getHeader("Refresh", rm2Url + "/metrics");
+ assertTrue(header.contains("; url=" + rm1Url));
+
+ header = getHeader("Refresh", rm2Url + "/jmx");
+ assertTrue(header.contains("; url=" + rm1Url));
+
+ // standby RM links /conf, /stacks, /logLevel, /static, /logs,
+ // /cluster/cluster as well as webService
// /ws/v1/cluster/info should not be redirected to active RM
header = getHeader("Refresh", rm2Url + "/cluster/cluster");
assertEquals(null, header);
@@ -285,12 +291,6 @@ public class TestRMFailover extends Clie
header = getHeader("Refresh", rm2Url + "/logLevel");
assertEquals(null, header);
- header = getHeader("Refresh", rm2Url + "/metrics");
- assertEquals(null, header);
-
- header = getHeader("Refresh", rm2Url + "/jmx");
- assertEquals(null, header);
-
header = getHeader("Refresh", rm2Url + "/static");
assertEquals(null, header);
Modified: hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebAppFilter.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebAppFilter.java?rev=1584956&r1=1584955&r2=1584956&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebAppFilter.java (original)
+++ hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebAppFilter.java Sat Apr 5 02:52:41 2014
@@ -46,7 +46,7 @@ public class RMWebAppFilter extends Guic
// 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", "/metrics", "/jmx", "/logs");
+ "/conf", "/stacks", "/logLevel", "/logs");
@Inject
public RMWebAppFilter(Injector injector) {