Repository: hadoop Updated Branches: refs/heads/trunk 0ac698864 -> 683897fd0
YARN-2713. "RM Home" link in NM should point to one of the RMs in an HA setup. (kasha) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/683897fd Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/683897fd Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/683897fd Branch: refs/heads/trunk Commit: 683897fd028dcc2185383f73b52d15245a69e0cb Parents: 0ac6988 Author: Karthik Kambatla <ka...@apache.org> Authored: Fri Oct 24 15:00:12 2014 -0700 Committer: Karthik Kambatla <ka...@apache.org> Committed: Fri Oct 24 15:00:12 2014 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../hadoop/yarn/webapp/util/WebAppUtils.java | 19 +++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/683897fd/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index c30499f..11e7fe8 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -57,6 +57,9 @@ Release 2.7.0 - UNRELEASED YARN-2254. TestRMWebServicesAppsModification should run against both CS and FS. (Zhihai Xu via kasha) + YARN-2713. "RM Home" link in NM should point to one of the RMs in an + HA setup. (kasha) + Release 2.6.0 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/683897fd/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java index a8f67ff..3aeb33e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java @@ -143,14 +143,29 @@ public class WebAppUtils { public static String getResolvedRMWebAppURLWithoutScheme(Configuration conf, Policy httpPolicy) { InetSocketAddress address = null; + String rmId = null; + if (HAUtil.isHAEnabled(conf)) { + // If HA enabled, pick one of the RM-IDs and rely on redirect to go to + // the Active RM + rmId = (String) HAUtil.getRMHAIds(conf).toArray()[0]; + } + if (httpPolicy == Policy.HTTPS_ONLY) { address = - conf.getSocketAddr(YarnConfiguration.RM_WEBAPP_HTTPS_ADDRESS, + conf.getSocketAddr( + rmId == null + ? YarnConfiguration.RM_WEBAPP_HTTPS_ADDRESS + : HAUtil.addSuffix( + YarnConfiguration.RM_WEBAPP_HTTPS_ADDRESS, rmId), YarnConfiguration.DEFAULT_RM_WEBAPP_HTTPS_ADDRESS, YarnConfiguration.DEFAULT_RM_WEBAPP_HTTPS_PORT); } else { address = - conf.getSocketAddr(YarnConfiguration.RM_WEBAPP_ADDRESS, + conf.getSocketAddr( + rmId == null + ? YarnConfiguration.RM_WEBAPP_ADDRESS + : HAUtil.addSuffix( + YarnConfiguration.RM_WEBAPP_ADDRESS, rmId), YarnConfiguration.DEFAULT_RM_WEBAPP_ADDRESS, YarnConfiguration.DEFAULT_RM_WEBAPP_PORT); }
