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

Merge -r 1478421:1478422 from trunk to branch-2. Fixes: MAPREDUCE-5036. Default shuffle handler port should not be 8080. Contributed by Sandy Ryza. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478424 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas White 2013-05-02 16:00:15 +00:00
parent bd198d7dfe
commit 0411165008
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

@ -56,6 +56,9 @@ Release 2.0.5-beta - UNRELEASED
MAPREDUCE-5145. Changed default max-attempts to be more than one for MR jobs MAPREDUCE-5145. Changed default max-attempts to be more than one for MR jobs
inline with YARN. (Zhijie Shen via vinodkv) inline with YARN. (Zhijie Shen via vinodkv)
MAPREDUCE-5036. Default shuffle handler port should not be 8080.
(Sandy Ryza via tomwhite)
OPTIMIZATIONS OPTIMIZATIONS
MAPREDUCE-4974. Optimising the LineRecordReader initialize() method MAPREDUCE-4974. Optimising the LineRecordReader initialize() method

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
View File

@ -1171,7 +1171,7 @@
<property> <property>
<name>mapreduce.shuffle.port</name> <name>mapreduce.shuffle.port</name>
<value>8080</value> <value>11000</value>
<description>Default port that the ShuffleHandler will run on. ShuffleHandler <description>Default port that the ShuffleHandler will run on. ShuffleHandler
is a service run at the NodeManager to facilitate transfers of intermediate is a service run at the NodeManager to facilitate transfers of intermediate
Map outputs to requesting Reducers. Map outputs to requesting Reducers.

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
View File

@ -153,7 +153,7 @@ public class ShuffleHandler extends AbstractService
new JobTokenSecretManager(); new JobTokenSecretManager();
public static final String SHUFFLE_PORT_CONFIG_KEY = "mapreduce.shuffle.port"; public static final String SHUFFLE_PORT_CONFIG_KEY = "mapreduce.shuffle.port";
public static final int DEFAULT_SHUFFLE_PORT = 8080; public static final int DEFAULT_SHUFFLE_PORT = 11000;
public static final String SUFFLE_SSL_FILE_BUFFER_SIZE_KEY = public static final String SUFFLE_SSL_FILE_BUFFER_SIZE_KEY =
"mapreduce.shuffle.ssl.file.buffer.size"; "mapreduce.shuffle.ssl.file.buffer.size";