Author: sseth
Date: Wed Sep 25 00:38:28 2013
New Revision: 1526068
URL: http://svn.apache.org/r1526068
Log:
merge YARN-1229 from branch-2. Define constraints on Auxiliary Service names.
Change ShuffleHandler service name from mapreduce.shuffle to mapreduce_shuffle.
Contributed by Xuan Gong.
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/INSTALL
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/apt/PluggableShuffleAndPluggableSort.apt.vm
hadoop/common/branches/branch-2.1-beta/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.1-beta/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt?rev=1526068&r1=1526067&r2=1526068&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt
Wed Sep 25 00:38:28 2013
@@ -11,6 +11,18 @@ Release 2.2.0 - UNRELEASED
OPTIMIZATIONS
BUG FIXES
+Release 2.1.2 - UNRELEASED
+
+ INCOMPATIBLE CHANGES
+
+ NEW FEATURES
+
+ IMPROVEMENTS
+
+ OPTIMIZATIONS
+
+ BUG FIXES
+
MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta
via tgraves)
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/INSTALL
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/INSTALL?rev=1526068&r1=1526067&r2=1526068&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/INSTALL
(original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/INSTALL Wed
Sep 25 00:38:28 2013
@@ -39,11 +39,11 @@ export YARN_CONF_DIR=$HADOOP_CONF_DIR
Step 7) Setup config: for running mapreduce applications, which now are in
user land, you need to setup nodemanager with the following configuration in
your yarn-site.xml before you start the nodemanager.
<property>
<name>yarn.nodemanager.aux-services</name>
- <value>mapreduce.shuffle</value>
+ <value>mapreduce_shuffle</value>
</property>
<property>
- <name>yarn.nodemanager.aux-services.mapreduce.shuffle.class</name>
+ <name>yarn.nodemanager.aux-services.mapreduce_shuffle.class</name>
<value>org.apache.hadoop.mapred.ShuffleHandler</value>
</property>
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/apt/PluggableShuffleAndPluggableSort.apt.vm
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/apt/PluggableShuffleAndPluggableSort.apt.vm?rev=1526068&r1=1526067&r2=1526068&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/apt/PluggableShuffleAndPluggableSort.apt.vm
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/apt/PluggableShuffleAndPluggableSort.apt.vm
Wed Sep 25 00:38:28 2013
@@ -83,14 +83,14 @@ Hadoop MapReduce Next Generation - Plugg
*--------------------------------------+---------------------+-----------------+
| <<Property>> | <<Default Value>> | <<Explanation>>
|
*--------------------------------------+---------------------+-----------------+
-| <<<yarn.nodemanager.aux-services>>> | <<<...,mapreduce.shuffle>>> | The
auxiliary service name |
+| <<<yarn.nodemanager.aux-services>>> | <<<...,mapreduce_shuffle>>> | The
auxiliary service name |
*--------------------------------------+---------------------+-----------------+
-| <<<yarn.nodemanager.aux-services.mapreduce.shuffle.class>>> |
<<<org.apache.hadoop.mapred.ShuffleHandler>>> | The auxiliary service class to
use |
+| <<<yarn.nodemanager.aux-services.mapreduce_shuffle.class>>> |
<<<org.apache.hadoop.mapred.ShuffleHandler>>> | The auxiliary service class to
use |
*--------------------------------------+---------------------+-----------------+
<<IMPORTANT:>> If setting an auxiliary service in addition the default
- <<<mapreduce.shuffle>>> service, then a new service key should be added to
the
+ <<<mapreduce_shuffle>>> service, then a new service key should be added to
the
<<<yarn.nodemanager.aux-services>>> property, for example
<<<mapred.shufflex>>>.
Then the property defining the corresponding class must be
- <<<yarn.nodemanager.aux-services.mapreduce.shufflex.class>>>.
+ <<<yarn.nodemanager.aux-services.mapreduce_shufflex.class>>>.
\ No newline at end of file
Modified:
hadoop/common/branches/branch-2.1-beta/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.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java?rev=1526068&r1=1526067&r2=1526068&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1-beta/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.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
Wed Sep 25 00:38:28 2013
@@ -146,7 +146,7 @@ public class ShuffleHandler extends Auxi
private ReadaheadPool readaheadPool = ReadaheadPool.getInstance();
public static final String MAPREDUCE_SHUFFLE_SERVICEID =
- "mapreduce.shuffle";
+ "mapreduce_shuffle";
private static final Map<String,String> userRsrc =
new ConcurrentHashMap<String,String>();
