Author: acmurthy
Date: Sat Apr 5 02:51:08 2014
New Revision: 1584954
URL: http://svn.apache.org/r1584954
Log:
YARN-1898. Addendum patch to ensure /jmx and /metrics are re-directed to Active
RM.
Modified:
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java
hadoop/common/trunk/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/trunk/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/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java?rev=1584954&r1=1584953&r2=1584954&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java
(original)
+++
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java
Sat Apr 5 02:51:08 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/trunk/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/trunk/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=1584954&r1=1584953&r2=1584954&view=diff
==============================================================================
---
hadoop/common/trunk/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/trunk/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:51:08 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) {
