Bläddra i källkod

MAPREDUCE-5868. Fixed an issue with TestPipeApplication that was causing the nightly builds to fail. Contributed by Akira Ajisaka.
svn merge --ignore-ancestry -c 1608579 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1608581 13f79535-47bb-0310-9956-ffa450edef68

Vinod Kumar Vavilapalli 11 år sedan
förälder
incheckning
ef0079813d

+ 3 - 0
hadoop-mapreduce-project/CHANGES.txt

@@ -134,6 +134,9 @@ Release 2.5.0 - UNRELEASED
     MAPREDUCE-5900. Changed to the interpret container preemption exit code as a
     task attempt killing event. (Mayank Bansal via zjshen)
 
+    MAPREDUCE-5868. Fixed an issue with TestPipeApplication that was causing the
+    nightly builds to fail. (Akira Ajisaka via vinodkv)
+
 Release 2.4.1 - 2014-06-23 
 
   INCOMPATIBLE CHANGES

+ 2 - 0
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java

@@ -183,6 +183,8 @@ public class TestPipeApplication {
       output.setWriter(wr);
       conf.set(Submitter.PRESERVE_COMMANDFILE, "true");
 
+      initStdOut(conf);
+
       Application<WritableComparable<IntWritable>, Writable, IntWritable, Text> application = new Application<WritableComparable<IntWritable>, Writable, IntWritable, Text>(
               conf, rReader, output, reporter, IntWritable.class, Text.class);
       application.getDownlink().flush();