You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sz...@apache.org on 2013/03/28 06:02:10 UTC
svn commit: r1461953 - in /hadoop/common/branches/branch-1.2: ./ bin/
src/docs/src/documentation/content/xdocs/ src/test/
src/test/org/apache/hadoop/tools/distcp2/
src/test/org/apache/hadoop/tools/distcp2/mapred/
src/test/org/apache/hadoop/tools/distcp...
Author: szetszwo
Date: Thu Mar 28 05:02:09 2013
New Revision: 1461953
URL: http://svn.apache.org/r1461953
Log:
svn merge -c 1461952 from branch-1 for MAPREDUCE-5081. Backport DistCpV2.
Added:
hadoop/common/branches/branch-1.2/src/docs/src/documentation/content/xdocs/distcp2.xml
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/docs/src/documentation/content/xdocs/distcp2.xml
hadoop/common/branches/branch-1.2/src/test/org/apache/hadoop/tools/distcp2/
- copied from r1461952, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/tools/distcp2/
hadoop/common/branches/branch-1.2/src/test/org/apache/hadoop/tools/distcp2/StubContext.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/tools/distcp2/StubContext.java
hadoop/common/branches/branch-1.2/src/test/org/apache/hadoop/tools/distcp2/TestCopyListing.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/tools/distcp2/TestCopyListing.java
hadoop/common/branches/branch-1.2/src/test/org/apache/hadoop/tools/distcp2/TestFileBasedCopyListing.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/tools/distcp2/TestFileBasedCopyListing.java
hadoop/common/branches/branch-1.2/src/test/org/apache/hadoop/tools/distcp2/TestGlobbedCopyListing.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/tools/distcp2/TestGlobbedCopyListing.java
hadoop/common/branches/branch-1.2/src/test/org/apache/hadoop/tools/distcp2/TestIntegration.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/tools/distcp2/TestIntegration.java
hadoop/common/branches/branch-1.2/src/test/org/apache/hadoop/tools/distcp2/TestOptionsParser.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/tools/distcp2/TestOptionsParser.java
hadoop/common/branches/branch-1.2/src/test/org/apache/hadoop/tools/distcp2/mapred/
- copied from r1461952, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/tools/distcp2/mapred/
hadoop/common/branches/branch-1.2/src/test/org/apache/hadoop/tools/distcp2/mapred/TestCopyCommitter.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/tools/distcp2/mapred/TestCopyCommitter.java
hadoop/common/branches/branch-1.2/src/test/org/apache/hadoop/tools/distcp2/mapred/TestCopyMapper.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/tools/distcp2/mapred/TestCopyMapper.java
hadoop/common/branches/branch-1.2/src/test/org/apache/hadoop/tools/distcp2/mapred/TestCopyOutputFormat.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/tools/distcp2/mapred/TestCopyOutputFormat.java
hadoop/common/branches/branch-1.2/src/test/org/apache/hadoop/tools/distcp2/mapred/TestUniformSizeInputFormat.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/tools/distcp2/mapred/TestUniformSizeInputFormat.java
hadoop/common/branches/branch-1.2/src/test/org/apache/hadoop/tools/distcp2/mapred/lib/
- copied from r1461952, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/tools/distcp2/mapred/lib/
hadoop/common/branches/branch-1.2/src/test/org/apache/hadoop/tools/distcp2/mapred/lib/TestDynamicInputFormat.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/tools/distcp2/mapred/lib/TestDynamicInputFormat.java
hadoop/common/branches/branch-1.2/src/test/org/apache/hadoop/tools/distcp2/util/
- copied from r1461952, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/tools/distcp2/util/
hadoop/common/branches/branch-1.2/src/test/org/apache/hadoop/tools/distcp2/util/TestDistCpUtils.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/tools/distcp2/util/TestDistCpUtils.java
hadoop/common/branches/branch-1.2/src/test/org/apache/hadoop/tools/distcp2/util/TestRetriableCommand.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/tools/distcp2/util/TestRetriableCommand.java
hadoop/common/branches/branch-1.2/src/test/org/apache/hadoop/tools/distcp2/util/TestThrottledInputStream.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/tools/distcp2/util/TestThrottledInputStream.java
hadoop/common/branches/branch-1.2/src/test/sslConfig.xml
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/test/sslConfig.xml
hadoop/common/branches/branch-1.2/src/tools/distcp-default.xml
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/tools/distcp-default.xml
hadoop/common/branches/branch-1.2/src/tools/org/apache/hadoop/tools/distcp2/
- copied from r1461952, hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/distcp2/
hadoop/common/branches/branch-1.2/src/tools/org/apache/hadoop/tools/distcp2/CopyListing.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/distcp2/CopyListing.java
hadoop/common/branches/branch-1.2/src/tools/org/apache/hadoop/tools/distcp2/DistCp.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/distcp2/DistCp.java
hadoop/common/branches/branch-1.2/src/tools/org/apache/hadoop/tools/distcp2/DistCpConstants.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/distcp2/DistCpConstants.java
hadoop/common/branches/branch-1.2/src/tools/org/apache/hadoop/tools/distcp2/DistCpOptionSwitch.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/distcp2/DistCpOptionSwitch.java
hadoop/common/branches/branch-1.2/src/tools/org/apache/hadoop/tools/distcp2/DistCpOptions.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/distcp2/DistCpOptions.java
hadoop/common/branches/branch-1.2/src/tools/org/apache/hadoop/tools/distcp2/FileBasedCopyListing.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/distcp2/FileBasedCopyListing.java
hadoop/common/branches/branch-1.2/src/tools/org/apache/hadoop/tools/distcp2/GlobbedCopyListing.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/distcp2/GlobbedCopyListing.java
hadoop/common/branches/branch-1.2/src/tools/org/apache/hadoop/tools/distcp2/OptionsParser.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/distcp2/OptionsParser.java
hadoop/common/branches/branch-1.2/src/tools/org/apache/hadoop/tools/distcp2/SimpleCopyListing.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/distcp2/SimpleCopyListing.java
hadoop/common/branches/branch-1.2/src/tools/org/apache/hadoop/tools/distcp2/mapred/
- copied from r1461952, hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/distcp2/mapred/
hadoop/common/branches/branch-1.2/src/tools/org/apache/hadoop/tools/distcp2/mapred/CopyCommitter.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/distcp2/mapred/CopyCommitter.java
hadoop/common/branches/branch-1.2/src/tools/org/apache/hadoop/tools/distcp2/mapred/CopyMapper.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/distcp2/mapred/CopyMapper.java
hadoop/common/branches/branch-1.2/src/tools/org/apache/hadoop/tools/distcp2/mapred/CopyOutputFormat.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/distcp2/mapred/CopyOutputFormat.java
hadoop/common/branches/branch-1.2/src/tools/org/apache/hadoop/tools/distcp2/mapred/RetriableDirectoryCreateCommand.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/distcp2/mapred/RetriableDirectoryCreateCommand.java
hadoop/common/branches/branch-1.2/src/tools/org/apache/hadoop/tools/distcp2/mapred/RetriableFileCopyCommand.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/distcp2/mapred/RetriableFileCopyCommand.java
hadoop/common/branches/branch-1.2/src/tools/org/apache/hadoop/tools/distcp2/mapred/UniformSizeInputFormat.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/distcp2/mapred/UniformSizeInputFormat.java
hadoop/common/branches/branch-1.2/src/tools/org/apache/hadoop/tools/distcp2/mapred/lib/
- copied from r1461952, hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/distcp2/mapred/lib/
hadoop/common/branches/branch-1.2/src/tools/org/apache/hadoop/tools/distcp2/mapred/lib/DynamicInputChunk.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/distcp2/mapred/lib/DynamicInputChunk.java
hadoop/common/branches/branch-1.2/src/tools/org/apache/hadoop/tools/distcp2/mapred/lib/DynamicInputFormat.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/distcp2/mapred/lib/DynamicInputFormat.java
hadoop/common/branches/branch-1.2/src/tools/org/apache/hadoop/tools/distcp2/mapred/lib/DynamicRecordReader.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/distcp2/mapred/lib/DynamicRecordReader.java
hadoop/common/branches/branch-1.2/src/tools/org/apache/hadoop/tools/distcp2/util/
- copied from r1461952, hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/distcp2/util/
hadoop/common/branches/branch-1.2/src/tools/org/apache/hadoop/tools/distcp2/util/DistCpUtils.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/distcp2/util/DistCpUtils.java
hadoop/common/branches/branch-1.2/src/tools/org/apache/hadoop/tools/distcp2/util/RetriableCommand.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/distcp2/util/RetriableCommand.java
hadoop/common/branches/branch-1.2/src/tools/org/apache/hadoop/tools/distcp2/util/ThrottledInputStream.java
- copied unchanged from r1461952, hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/distcp2/util/ThrottledInputStream.java
Modified:
hadoop/common/branches/branch-1.2/ (props changed)
hadoop/common/branches/branch-1.2/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-1.2/bin/hadoop
hadoop/common/branches/branch-1.2/src/docs/src/documentation/content/xdocs/site.xml
Propchange: hadoop/common/branches/branch-1.2/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1:r1461952
Modified: hadoop/common/branches/branch-1.2/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/CHANGES.txt?rev=1461953&r1=1461952&r2=1461953&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.2/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.2/CHANGES.txt Thu Mar 28 05:02:09 2013
@@ -63,6 +63,8 @@ Release 1.2.0 - unreleased
HDFS-4597. Backport WebHDFS concat. (szetszwo)
+ MAPREDUCE-5081. Backport DistCpV2. (szetszwo)
+
IMPROVEMENTS
HADOOP-9434. Backport HADOOP-9267: hadoop -h|-{0,2}help should print usage.
Propchange: hadoop/common/branches/branch-1.2/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1/CHANGES.txt:r1461952
Modified: hadoop/common/branches/branch-1.2/bin/hadoop
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/bin/hadoop?rev=1461953&r1=1461952&r2=1461953&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.2/bin/hadoop (original)
+++ hadoop/common/branches/branch-1.2/bin/hadoop Thu Mar 28 05:02:09 2013
@@ -91,6 +91,7 @@ print_usage()
echo " version print the version"
echo " jar <jar> run a jar file"
echo " distcp <srcurl> <desturl> copy file or directories recursively"
+ echo " distcp2 <srcurl> <desturl> DistCp version 2"
echo " archive -archiveName NAME -p <parent path> <src>* <dest> create a hadoop archive"
echo " classpath prints the class path needed to get the"
echo " Hadoop jar and the required libraries"
@@ -316,6 +317,10 @@ elif [ "$COMMAND" = "distcp" ] ; then
CLASS=org.apache.hadoop.tools.DistCp
CLASSPATH=${CLASSPATH}:${TOOL_PATH}
HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
+elif [ "$COMMAND" = "distcp2" ] ; then
+ CLASS=org.apache.hadoop.tools.distcp2.DistCp
+ CLASSPATH=${CLASSPATH}:${TOOL_PATH}
+ HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
elif [ "$COMMAND" = "daemonlog" ] ; then
CLASS=org.apache.hadoop.log.LogLevel
HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
Modified: hadoop/common/branches/branch-1.2/src/docs/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/docs/src/documentation/content/xdocs/site.xml?rev=1461953&r1=1461952&r2=1461953&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.2/src/docs/src/documentation/content/xdocs/site.xml (original)
+++ hadoop/common/branches/branch-1.2/src/docs/src/documentation/content/xdocs/site.xml Thu Mar 28 05:02:09 2013
@@ -47,6 +47,7 @@ See http://forrest.apache.org/docs/linki
<streaming label="Hadoop Streaming" href="streaming.html" />
<commands label="Hadoop Commands" href="commands_manual.html" />
<distcp label="DistCp" href="distcp.html" />
+ <distcp2 label="DistCp Version 2" href="distcp2.html" />
<vaidya label="Vaidya" href="vaidya.html"/>
<archives label="Hadoop Archives" href="hadoop_archives.html"/>
<gridmix label="Gridmix" href="gridmix.html"/>