From 303c650d0dfcb10760cea589b8cef6ace8e36417 Mon Sep 17 00:00:00 2001 From: Jason Lowe Date: Wed, 10 Feb 2016 16:44:12 +0000 Subject: [PATCH] MAPREDUCE-6191. Improve clearing stale state of Java serialization testcase. (Sam Liu via Eric Yang) (cherry picked from commit c379e102ddab1b83fd69e4492a40c9901fb50675) Conflicts: hadoop-mapreduce-project/CHANGES.txt --- hadoop-mapreduce-project/CHANGES.txt | 6 ++++++ .../org/apache/hadoop/mapred/TestJavaSerialization.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index c1bdf03c746..34ed759c0d5 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -462,6 +462,9 @@ Release 2.7.3 - UNRELEASED MAPREDUCE-6413. TestLocalJobSubmission is failing with unknown host (zhihai xu via jlowe) + MAPREDUCE-6191. Improve clearing stale state of Java serialization + testcase. (Sam Liu via Eric Yang) + Release 2.7.2 - 2016-01-25 INCOMPATIBLE CHANGES @@ -749,6 +752,9 @@ Release 2.6.5 - UNRELEASED MAPREDUCE-6413. TestLocalJobSubmission is failing with unknown host (zhihai xu via jlowe) + MAPREDUCE-6191. Improve clearing stale state of Java serialization + testcase. (Sam Liu via Eric Yang) + Release 2.6.4 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJavaSerialization.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJavaSerialization.java index 4dea0d79175..265118a70f6 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJavaSerialization.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJavaSerialization.java @@ -81,7 +81,7 @@ public class TestJavaSerialization extends TestCase { } private void cleanAndCreateInput(FileSystem fs) throws IOException { - fs.delete(INPUT_FILE, true); + fs.delete(INPUT_DIR, true); fs.delete(OUTPUT_DIR, true); OutputStream os = fs.create(INPUT_FILE);