diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java index a57d507..3515a53 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java @@ -26,13 +26,14 @@ import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; +import java.util.List; +import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.ha.ClientBaseWithFixes; import org.apache.hadoop.ha.HAServiceProtocol; -import org.apache.hadoop.ha.proto.HAServiceProtocolProtos; import org.apache.hadoop.service.Service.STATE; import org.apache.hadoop.yarn.api.records.ApplicationId; import org.apache.hadoop.yarn.client.api.YarnClient; @@ -252,4 +253,37 @@ private void verifyExpectedException(String exceptionMessage){ .contains("Application with id '" + fakeAppId + "' " + "doesn't exist in RM.")); } + + @Test + public void testRMWebAppRedirect() throws YarnException, + InterruptedException, IOException { + cluster = new MiniYARNCluster(TestRMFailover.class.getName(), 2, 0, 1, 1); + conf.setBoolean(YarnConfiguration.AUTO_FAILOVER_ENABLED, false); + + cluster.init(conf); + cluster.start(); + getAdminService(0).transitionToActive(req); + String rm1Url = "http://0.0.0.0:18088"; + String rm2Url = "http://0.0.0.0:28088"; + String header = getHeader("Refresh", rm2Url); + assertTrue(header.contains("; url=" + rm1Url)); + + header = getHeader("Refresh", rm2Url + "/cluster/cluster"); + assertEquals(null, header); + + // Due to the limitation of MiniYARNCluster and dispatcher is a singleton, + // we couldn't add the test case after explicitFailover(); + } + + static String getHeader(String field, String url) { + String fieldHeader = null; + try { + Map> map = + new URL(url).openConnection().getHeaderFields(); + fieldHeader = map.get(field).get(0); + } catch (Exception e) { + // throw new RuntimeException(e); + } + return fieldHeader; + } } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/Dispatcher.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/Dispatcher.java index 66dd21b..f7efdef 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/Dispatcher.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/Dispatcher.java @@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkState; import java.io.IOException; +import java.io.PrintWriter; import java.util.Timer; import java.util.TimerTask; @@ -89,6 +90,19 @@ public void service(HttpServletRequest req, HttpServletResponse res) prepareToExit(); return; } + + if (webApp.isStandbyMode() && !uri.equals("/" + webApp.name() + "/cluster")) { + String redirectPath = webApp.getRedirectPath(); + if (redirectPath != null && !redirectPath.isEmpty()) { + String redirectMsg = + "Redirecting to the current active RM: " + redirectPath; + res.addHeader("Refresh", "3; url=" + redirectPath); + PrintWriter out = res.getWriter(); + out.println(redirectMsg); + return; + } + } + // if they provide a redirectPath go there instead of going to // "/" so that filters can differentiate the webapps. if (uri.equals("/")) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApp.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApp.java index c5eda8a..7e40c74 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApp.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApp.java @@ -55,7 +55,7 @@ private volatile String name; private volatile List servePathSpecs = new ArrayList(); - // path to redirect to if user goes to "/" + // path to redirect to if user goes to "/", or if redirect to active rm private volatile String redirectPath; private volatile String wsName; private volatile Configuration conf; @@ -134,7 +134,9 @@ public void joinThread() { * more easily differentiate the different webapps. * @param path the path to redirect to */ - void setRedirectPath(String path) { this.redirectPath = path; } + protected void setRedirectPath(String path) { + this.redirectPath = path; + } void setWebServices (String name) { this.wsName = name; } @@ -267,5 +269,9 @@ static String getPrefix(String pathSpec) { return pathSpec.substring(start, ci + 1); } + public boolean isStandbyMode() { + return false; + } + public abstract void setup(); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMHAUtils.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMHAUtils.java new file mode 100644 index 0000000..ca2330c --- /dev/null +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMHAUtils.java @@ -0,0 +1,71 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.yarn.server.resourcemanager; + +import java.util.Collection; + +import org.apache.hadoop.classification.InterfaceAudience.Private; +import org.apache.hadoop.classification.InterfaceStability.Unstable; +import org.apache.hadoop.fs.CommonConfigurationKeys; +import org.apache.hadoop.ha.HAServiceProtocol; +import org.apache.hadoop.ha.HAServiceProtocol.HAServiceState; +import org.apache.hadoop.ha.HAServiceTarget; +import org.apache.hadoop.yarn.client.RMHAServiceTarget; +import org.apache.hadoop.yarn.conf.YarnConfiguration; + +@Private +@Unstable +public class RMHAUtils { + + public static String findActiveRMHAId(YarnConfiguration yarnConf) { + String rmId = yarnConf.get(YarnConfiguration.RM_HA_ID); + Collection rmIds = + yarnConf.getStringCollection(YarnConfiguration.RM_HA_IDS); + for (String currentId : rmIds) { + yarnConf.set(YarnConfiguration.RM_HA_ID, currentId); + try { + HAServiceState haState = getHAState(yarnConf); + if (haState.equals(HAServiceState.ACTIVE)) { + yarnConf.set(YarnConfiguration.RM_HA_ID, rmId); + return currentId; + } + } catch (Exception e) { + } + } + yarnConf.set(YarnConfiguration.RM_HA_ID, rmId); + return null; + } + + private static HAServiceState getHAState(YarnConfiguration yarnConf) + throws Exception { + HAServiceTarget haServiceTarget; + + haServiceTarget = new RMHAServiceTarget(yarnConf); + int rpcTimeoutForChecks = -1; + if (yarnConf != null) { + rpcTimeoutForChecks = + yarnConf.getInt(CommonConfigurationKeys.HA_FC_CLI_CHECK_TIMEOUT_KEY, + CommonConfigurationKeys.HA_FC_CLI_CHECK_TIMEOUT_DEFAULT); + } + HAServiceProtocol proto = + haServiceTarget.getProxy(yarnConf, rpcTimeoutForChecks); + HAServiceState haState = proto.getServiceStatus().getState(); + return haState; + } +} \ No newline at end of file diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebApp.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebApp.java index 5a0980e..f81d1de 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebApp.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebApp.java @@ -20,7 +20,13 @@ import static org.apache.hadoop.yarn.util.StringHelper.pajoin; +import java.net.InetSocketAddress; + +import org.apache.hadoop.ha.HAServiceProtocol.HAServiceState; +import org.apache.hadoop.http.HttpConfig; +import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.RMContext; +import org.apache.hadoop.yarn.server.resourcemanager.RMHAUtils; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; import org.apache.hadoop.yarn.server.resourcemanager.security.QueueACLsManager; import org.apache.hadoop.yarn.server.security.ApplicationACLsManager; @@ -34,6 +40,7 @@ public class RMWebApp extends WebApp implements YarnWebParams { private final ResourceManager rm; + private boolean standbyMode = false; public RMWebApp(ResourceManager rm) { this.rm = rm; @@ -59,4 +66,52 @@ public void setup() { route("/scheduler", RmController.class, "scheduler"); route(pajoin("/queue", QUEUE_NAME), RmController.class, "queue"); } + + @Override + public boolean isStandbyMode() { + if (rm.getRMContext().getHAServiceState() == HAServiceState.STANDBY) { + standbyMode = true; + return true; + } + standbyMode = false; + return false; + } + + @Override + public String getRedirectPath() { + if (standbyMode) { + return buildRedirectPath((YarnConfiguration) rm.getConfig()); + } else + return super.getRedirectPath(); + } + + private String buildRedirectPath(YarnConfiguration yarnConf) { + String activeRMHAId = RMHAUtils.findActiveRMHAId(yarnConf); + String rmId = yarnConf.get(YarnConfiguration.RM_HA_ID); + String path = ""; + if (activeRMHAId != null) { + yarnConf.set(YarnConfiguration.RM_HA_ID, activeRMHAId); + InetSocketAddress sock; + if (!HttpConfig.isSecure()) { + sock = + yarnConf.getSocketAddr(YarnConfiguration.RM_WEBAPP_ADDRESS, + YarnConfiguration.DEFAULT_RM_WEBAPP_ADDRESS, + YarnConfiguration.DEFAULT_RM_WEBAPP_PORT); + } else { + sock = + yarnConf.getSocketAddr(YarnConfiguration.RM_WEBAPP_HTTPS_ADDRESS, + YarnConfiguration.DEFAULT_RM_WEBAPP_HTTPS_ADDRESS, + YarnConfiguration.DEFAULT_RM_WEBAPP_HTTPS_PORT); + } + path = sock.getHostName() + ":" + Integer.toString(sock.getPort()); + if (!HttpConfig.isSecure()) { + path = "http://" + path; + } else { + path = "https://" + path; + } + yarnConf.set(YarnConfiguration.RM_HA_ID, rmId); + } + return path; + } + }