| commit | 0783184f4b3f669f7211e42b395b62d63144100d | [log] [tgz] |
|---|---|---|
| author | Wangda Tan <wangda@apache.org> | Tue Nov 03 11:18:34 2015 -0800 |
| committer | Wangda Tan <wangda@apache.org> | Tue Nov 03 11:18:34 2015 -0800 |
| tree | 0fa24e9bc7b2ec00f3fc37b3bdf0c9feaa9a9d1c | |
| parent | 957f0311a160afb40dbb0619f455445b4f5d1e32 [diff] |
YARN-4326. Fix TestDistributedShell timeout as AHS in MiniYarnCluster no longer binds to default port 8188. (Meng Ding via wangda)
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 1040f45..d6ad672 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt
@@ -1039,6 +1039,9 @@ YARN-4127. RM fail with noAuth error if switched from failover to non-failover. (Varun Saxena via jianhe) + YARN-4326. Fix TestDistributedShell timeout as AHS in MiniYarnCluster no longer + binds to default port 8188. (Meng Ding via wangda) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java index dcb6e72..3197875 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java
@@ -92,9 +92,14 @@ protected void setupInternal(int numNodeManager) throws Exception { yarnCluster.init(conf); yarnCluster.start(); - + + conf.set( + YarnConfiguration.TIMELINE_SERVICE_WEBAPP_ADDRESS, + MiniYARNCluster.getHostname() + ":" + + yarnCluster.getApplicationHistoryServer().getPort()); + waitForNMsToRegister(); - + URL url = Thread.currentThread().getContextClassLoader().getResource("yarn-site.xml"); if (url == null) { throw new RuntimeException("Could not find 'yarn-site.xml' dummy file in classpath");