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 wh...@apache.org on 2015/10/10 12:25:11 UTC
hadoop git commit: Revert "HADOOP-12469. distcp shout not ignore the
ignoreFailures option. Contributed by Mingliang Liu."
Repository: hadoop
Updated Branches:
refs/heads/trunk fa5a54cac -> 7e2c971fe
Revert "HADOOP-12469. distcp shout not ignore the ignoreFailures option. Contributed by Mingliang Liu."
This reverts commit fa5a54cac7e0f70ef28ebfe94aee95ffbbaf20e8.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7e2c971f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7e2c971f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7e2c971f
Branch: refs/heads/trunk
Commit: 7e2c971fedd1195a51203ff12fdfdeb4642f2082
Parents: fa5a54c
Author: Haohui Mai <wh...@apache.org>
Authored: Sat Oct 10 03:24:59 2015 -0700
Committer: Haohui Mai <wh...@apache.org>
Committed: Sat Oct 10 03:24:59 2015 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 ---
.../main/java/org/apache/hadoop/tools/mapred/CopyMapper.java | 2 +-
.../java/org/apache/hadoop/tools/mapred/TestCopyMapper.java | 8 +++-----
3 files changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7e2c971f/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 13f8d5d..9d954d0 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1277,9 +1277,6 @@ Release 2.8.0 - UNRELEASED
HADOOP-12441. Fixed shell-kill command behaviour to work correctly on some
Linux distributions after HADOOP-12317. (Wangda Tan via vinodkv)
- HADOOP-12469. distcp shout not ignore the ignoreFailures option.
- (Mingliang Liu via wheat9)
-
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7e2c971f/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyMapper.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyMapper.java b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyMapper.java
index c0b3d77..f75fe76 100644
--- a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyMapper.java
+++ b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyMapper.java
@@ -288,7 +288,7 @@ public class CopyMapper extends Mapper<Text, CopyListingFileStatus, Text, Text>
} catch (Exception e) {
context.setStatus("Copy Failure: " + sourceFileStatus.getPath());
throw new IOException("File copy failed: " + sourceFileStatus.getPath() +
- " --> " + target, e.getCause());
+ " --> " + target, e);
}
incrementCounter(context, Counter.BYTESEXPECTED, sourceFileStatus.getLen());
incrementCounter(context, Counter.BYTESCOPIED, bytesCopied);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7e2c971f/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyMapper.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyMapper.java b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyMapper.java
index 080b1f4..ec60fa8 100644
--- a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyMapper.java
+++ b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyMapper.java
@@ -713,7 +713,7 @@ public class TestCopyMapper {
// wrapped twice - once in RetriableCommand and again in CopyMapper
// itself.
if (e.getCause() == null || e.getCause().getCause() == null ||
- !(e.getCause() instanceof AccessControlException)) {
+ !(e.getCause().getCause() instanceof AccessControlException)) {
throw new RuntimeException(e);
}
}
@@ -841,10 +841,8 @@ public class TestCopyMapper {
}
catch (Exception exception) {
// Check that the exception suggests the use of -pb/-skipCrc.
- Assert.assertTrue("Exception should have suggested the use of -pb.",
- exception.getCause().getMessage().contains("pb"));
- Assert.assertTrue("Exception should have suggested the use of -skipCrc.",
- exception.getCause().getMessage().contains("skipCrc"));
+ Assert.assertTrue("Failure exception should have suggested the use of -pb.", exception.getCause().getCause().getMessage().contains("pb"));
+ Assert.assertTrue("Failure exception should have suggested the use of -skipCrc.", exception.getCause().getCause().getMessage().contains("skipCrc"));
}
}