From 4cd5cb862c1dc00560670fec82fd59bdc8a94a41 Mon Sep 17 00:00:00 2001 From: Jason Darrell Lowe Date: Fri, 2 Aug 2013 22:53:52 +0000 Subject: [PATCH] svn merge -c 1509900 FIXES: MAPREDUCE-5440. TestCopyCommitter Fails on JDK7. Contributed by Robert Parker git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509901 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 4 ++++ .../org/apache/hadoop/tools/mapred/TestCopyCommitter.java | 1 + 2 files changed, 5 insertions(+) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index e082dd794d2..0e506a4954c 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -69,6 +69,8 @@ Release 2.1.1-beta - UNRELEASED MAPREDUCE-3193. FileInputFormat doesn't read files recursively in the input path dir (Devaraj K via jlowe) + MAPREDUCE-5440. TestCopyCommitter Fails on JDK7 (Robert Parker via jlowe) + Release 2.1.0-beta - 2013-08-06 INCOMPATIBLE CHANGES @@ -1148,6 +1150,8 @@ Release 0.23.10 - UNRELEASED MAPREDUCE-5419. TestSlive is getting FileNotFound Exception (Robert Parker via jlowe) + MAPREDUCE-5440. TestCopyCommitter Fails on JDK7 (Robert Parker via jlowe) + Release 0.23.9 - 2013-07-08 INCOMPATIBLE CHANGES diff --git a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java index 82736f4d3cb..10e09893f69 100644 --- a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java +++ b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java @@ -169,6 +169,7 @@ public class TestCopyCommitter { Assert.fail("Preserve status failure"); } finally { TestDistCpUtils.delete(fs, "/tmp1"); + conf.unset(DistCpConstants.CONF_LABEL_PRESERVE_STATUS); } }