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 at...@apache.org on 2012/08/24 22:38:17 UTC
svn commit: r1377092 - in /hadoop/common/branches/HDFS-3077: ./
hadoop-tools/hadoop-datajoin/
hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/
hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/
hadoop-tools/hadoop...
Author: atm
Date: Fri Aug 24 20:38:08 2012
New Revision: 1377092
URL: http://svn.apache.org/viewvc?rev=1377092&view=rev
Log:
Merge trunk into HDFS-3077 branch.
Modified:
hadoop/common/branches/HDFS-3077/ (props changed)
hadoop/common/branches/HDFS-3077/hadoop-tools/hadoop-datajoin/ (props changed)
hadoop/common/branches/HDFS-3077/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java
hadoop/common/branches/HDFS-3077/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java
hadoop/common/branches/HDFS-3077/hadoop-tools/hadoop-gridmix/ (props changed)
hadoop/common/branches/HDFS-3077/pom.xml
Propchange: hadoop/common/branches/HDFS-3077/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1373573-1377085
Propchange: hadoop/common/branches/HDFS-3077/hadoop-tools/hadoop-datajoin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Aug 24 20:38:08 2012
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings
Modified: hadoop/common/branches/HDFS-3077/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java?rev=1377092&r1=1377091&r2=1377092&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java Fri Aug 24 20:38:08 2012
@@ -359,18 +359,20 @@ public class DistCp extends Configured i
* @param argv Command-line arguments sent to DistCp.
*/
public static void main(String argv[]) {
+ int exitCode;
try {
DistCp distCp = new DistCp();
Cleanup CLEANUP = new Cleanup(distCp);
ShutdownHookManager.get().addShutdownHook(CLEANUP,
SHUTDOWN_HOOK_PRIORITY);
- System.exit(ToolRunner.run(getDefaultConf(), distCp, argv));
+ exitCode = ToolRunner.run(getDefaultConf(), distCp, argv);
}
catch (Exception e) {
LOG.error("Couldn't complete DistCp operation: ", e);
- System.exit(DistCpConstants.UNKNOWN_ERROR);
+ exitCode = DistCpConstants.UNKNOWN_ERROR;
}
+ System.exit(exitCode);
}
/**
Modified: hadoop/common/branches/HDFS-3077/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java?rev=1377092&r1=1377091&r2=1377092&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java Fri Aug 24 20:38:08 2012
@@ -91,7 +91,10 @@ public class RetriableFileCopyCommand ex
context, fileAttributes);
compareFileLengths(sourceFileStatus, tmpTargetPath, configuration, bytesRead);
- compareCheckSums(sourceFS, sourceFileStatus.getPath(), targetFS, tmpTargetPath);
+ //At this point, src&dest lengths are same. if length==0, we skip checksum
+ if (bytesRead != 0) {
+ compareCheckSums(sourceFS, sourceFileStatus.getPath(), targetFS, tmpTargetPath);
+ }
promoteTmpToTarget(tmpTargetPath, target, targetFS);
return bytesRead;
Propchange: hadoop/common/branches/HDFS-3077/hadoop-tools/hadoop-gridmix/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Aug 24 20:38:08 2012
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings
Modified: hadoop/common/branches/HDFS-3077/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/pom.xml?rev=1377092&r1=1377091&r2=1377092&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/pom.xml (original)
+++ hadoop/common/branches/HDFS-3077/pom.xml Fri Aug 24 20:38:08 2012
@@ -365,6 +365,18 @@ xsi:schemaLocation="http://maven.apache.
</reportSets>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.4</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>analyze-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
</plugins>
</reporting>