From abae89ed3269c0c980db27f471c00cb8906b1670 Mon Sep 17 00:00:00 2001 From: Mahadev Konar Date: Fri, 21 Oct 2011 22:48:29 +0000 Subject: [PATCH] MAPREDUCE-3242. Trunk compilation broken with bad interaction from MAPREDUCE-3070 and MAPREDUCE-3239. (mahadev) - Merging r1187587 from trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187589 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/yarn/conf/YarnConfiguration.java | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 019cfbec952..5e0a4672df1 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -1670,6 +1670,9 @@ Release 0.23.0 - Unreleased MAPREDUCE-3070. Fix NodeManager to use ephemeral ports by default. (Devaraj K via acmurthy) + MAPREDUCE-3242. Trunk compilation broken with bad interaction from + MAPREDUCE-3070 and MAPREDUCE-3239. (mahadev) + 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 6ed5806ea40..52b84d83c16 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 @@ -227,7 +227,9 @@ 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:0"; + public static final int DEFAULT_NM_PORT = 0; + public static final String DEFAULT_NM_ADDRESS = "0.0.0.0:" + + DEFAULT_NM_PORT; /** who will execute(launch) the containers.*/ public static final String NM_CONTAINER_EXECUTOR =