From 59348f53a108d76e57041a87f20396f313be6ee6 Mon Sep 17 00:00:00 2001 From: Arun Murthy Date: Fri, 21 Oct 2011 18:48:07 +0000 Subject: [PATCH] Merge -c 1187496 from trunk to branch-0.23 to complete fix for MAPREDUCE-3070. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187497 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/yarn/conf/YarnConfiguration.java | 2 +- .../src/main/resources/yarn-default.xml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 22d257126e3..809f95f21f7 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -1664,6 +1664,9 @@ Release 0.23.0 - Unreleased MAPREDUCE-3226. Fix shutdown of fetcher threads. (vinodkv via acmurthy) + MAPREDUCE-3070. Fix NodeManager to use ephemeral ports by default. + (Devaraj K via acmurthy) + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java index 151cfc9e836..8236e06c0c1 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java @@ -218,7 +218,7 @@ public class YarnConfiguration extends Configuration { /** address of node manager IPC.*/ public static final String NM_ADDRESS = NM_PREFIX + "address"; - public static final String DEFAULT_NM_ADDRESS = "0.0.0.0:45454"; + public static final String DEFAULT_NM_ADDRESS = "0.0.0.0:0"; /** who will execute(launch) the containers.*/ public static final String NM_CONTAINER_EXECUTOR = diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/resources/yarn-default.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/resources/yarn-default.xml index 42311dcc647..3a3847e3ffa 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/resources/yarn-default.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/resources/yarn-default.xml @@ -191,7 +191,7 @@ address of node manager IPC. yarn.nodemanager.address - 0.0.0.0:45454 + 0.0.0.0:0