From 915cd6c3f43f32b3ee13aceee68b5e86455e79f2 Mon Sep 17 00:00:00 2001 From: Jian He Date: Mon, 14 Dec 2015 14:54:42 -0800 Subject: [PATCH] YARN-4402. TestNodeManagerShutdown And TestNodeManagerResync fails with bind exception. Contributed by Brahma Reddy Battula --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../hadoop/yarn/server/nodemanager/TestNodeManagerResync.java | 3 +++ .../yarn/server/nodemanager/TestNodeManagerShutdown.java | 3 +++ 3 files changed, 9 insertions(+) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 0324d530be..ed4fc5970a 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -1132,6 +1132,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 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 1a0412a1a5..e8c4634e77 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 @@ private YarnConfiguration createNMConfig(int port) throws IOException { 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()); 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 1fa5fbb262..980c76440a 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 @@ private YarnConfiguration createNMConfig(int port) throws IOException { 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());