Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Arun Murthy 2011-10-21 18:48:07 +00:00
parent 1edb5c8f9e
commit 59348f53a1
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -1664,6 +1664,9 @@ Release 0.23.0 - Unreleased
MAPREDUCE-3226. Fix shutdown of fetcher threads. (vinodkv via acmurthy) 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 Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
View File

@ -218,7 +218,7 @@ public class YarnConfiguration extends Configuration {
/** address of node manager IPC.*/ /** address of node manager IPC.*/
public static final String NM_ADDRESS = NM_PREFIX + "address"; 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.*/ /** who will execute(launch) the containers.*/
public static final String NM_CONTAINER_EXECUTOR = public static final String NM_CONTAINER_EXECUTOR =

2
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/resources/yarn-default.xml
View File

@ -191,7 +191,7 @@
<property> <property>
<description>address of node manager IPC.</description> <description>address of node manager IPC.</description>
<name>yarn.nodemanager.address</name> <name>yarn.nodemanager.address</name>
<value>0.0.0.0:45454</value> <value>0.0.0.0:0</value>
</property> </property>
<property> <property>