Repository: hadoop Updated Branches: refs/heads/branch-2 34e86d8d4 -> 72544db3c
YARN-4402. TestNodeManagerShutdown And TestNodeManagerResync fails with bind exception. Contributed by Brahma Reddy Battula Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/72544db3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/72544db3 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/72544db3 Branch: refs/heads/branch-2 Commit: 72544db3cdcdb19f6125cd0d53026e1ed254efe7 Parents: 34e86d8 Author: Jian He <jia...@apache.org> Authored: Mon Dec 14 14:54:42 2015 -0800 Committer: Jian He <jia...@apache.org> Committed: Mon Dec 14 14:59:18 2015 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../hadoop/yarn/server/nodemanager/TestNodeManagerResync.java | 3 +++ .../hadoop/yarn/server/nodemanager/TestNodeManagerShutdown.java | 3 +++ 3 files changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/72544db3/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index a7a6530..7d98f35 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -1080,6 +1080,9 @@ Release 2.8.0 - UNRELEASED YARN-4403. (AM/NM/Container)LivelinessMonitor should use monotonic time when calculating period. (Junping Du via jianhe) + YARN-4402. TestNodeManagerShutdown And TestNodeManagerResync fails with + bind exception. (Brahma Reddy Battula via jianhe) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/72544db3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerResync.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerResync.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerResync.java index 1a0412a..e8c4634 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerResync.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerResync.java @@ -389,6 +389,9 @@ public class TestNodeManagerResync { conf.set(YarnConfiguration.NM_ADDRESS, "127.0.0.1:" + port); conf.set(YarnConfiguration.NM_LOCALIZER_ADDRESS, "127.0.0.1:" + ServerSocketUtil.getPort(49155, 10)); + conf.set(YarnConfiguration.NM_WEBAPP_ADDRESS, + "127.0.0.1:" + ServerSocketUtil + .getPort(YarnConfiguration.DEFAULT_NM_WEBAPP_PORT, 10)); conf.set(YarnConfiguration.NM_LOG_DIRS, logsDir.getAbsolutePath()); conf.set(YarnConfiguration.NM_REMOTE_APP_LOG_DIR, remoteLogsDir.getAbsolutePath()); http://git-wip-us.apache.org/repos/asf/hadoop/blob/72544db3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerShutdown.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerShutdown.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerShutdown.java index 1fa5fbb..980c764 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerShutdown.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerShutdown.java @@ -272,6 +272,9 @@ public class TestNodeManagerShutdown { conf.set(YarnConfiguration.NM_ADDRESS, "127.0.0.1:" + port); conf.set(YarnConfiguration.NM_LOCALIZER_ADDRESS, "127.0.0.1:" + ServerSocketUtil.getPort(49158, 10)); + conf.set(YarnConfiguration.NM_WEBAPP_ADDRESS, + "127.0.0.1:" + ServerSocketUtil + .getPort(YarnConfiguration.DEFAULT_NM_WEBAPP_PORT, 10)); conf.set(YarnConfiguration.NM_LOG_DIRS, logsDir.getAbsolutePath()); conf.set(YarnConfiguration.NM_REMOTE_APP_LOG_DIR, remoteLogsDir.getAbsolutePath()); conf.set(YarnConfiguration.NM_LOCAL_DIRS, nmLocalDir.getAbsolutePath());
