svn commit: r1489061 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client: hadoop-mapreduce-client-core/src/main/resources/ hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/

[tomwhite]

Author: tomwhite
Date: Mon Jun  3 16:55:51 2013
New Revision: 1489061

URL: http://svn.apache.org/r1489061
Log:
Merge -r 1489059:1489060 from trunk to branch-2. Fixes: MAPREDUCE-5036. Default 
shuffle handler port should not be 8080. Contributed by Sandy Ryza.

Modified:
    
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
    
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml?rev=1489061&r1=1489060&r2=1489061&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
 Mon Jun  3 16:55:51 2013
@@ -1171,7 +1171,7 @@
 
 <property>
   <name>mapreduce.shuffle.port</name>
-  <value>11000</value>
+  <value>13562</value>
   <description>Default port that the ShuffleHandler will run on. 
ShuffleHandler 
    is a service run at the NodeManager to facilitate transfers of intermediate 
    Map outputs to requesting Reducers.

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java?rev=1489061&r1=1489060&r2=1489061&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
 Mon Jun  3 16:55:51 2013
@@ -153,7 +153,7 @@ public class ShuffleHandler extends Abst
     new JobTokenSecretManager();
 
   public static final String SHUFFLE_PORT_CONFIG_KEY = 
"mapreduce.shuffle.port";
-  public static final int DEFAULT_SHUFFLE_PORT = 11000;
+  public static final int DEFAULT_SHUFFLE_PORT = 13562;
 
   public static final String SUFFLE_SSL_FILE_BUFFER_SIZE_KEY =
     "mapreduce.shuffle.ssl.file.buffer.size";