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 bo...@apache.org on 2012/02/28 18:46:40 UTC
svn commit: r1294748 - in
/hadoop/common/branches/branch-0.23.2/hadoop-tools/hadoop-streaming/src:
main/java/org/apache/hadoop/streaming/ test/java/org/apache/hadoop/streaming/
Author: bobby
Date: Tue Feb 28 17:46:40 2012
New Revision: 1294748
URL: http://svn.apache.org/viewvc?rev=1294748&view=rev
Log:
svn merge -c 1294743 trunk to branch-0.23.2 FIXES MAPREDUCE-3790 Broken pipe on streaming job can lead to truncated output for a successful job (Jason Lowe via bobby)
Added:
hadoop/common/branches/branch-0.23.2/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/OutputOnlyApp.java
- copied unchanged from r1294743, hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/OutputOnlyApp.java
hadoop/common/branches/branch-0.23.2/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestUnconsumedInput.java
- copied unchanged from r1294743, hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestUnconsumedInput.java
Modified:
hadoop/common/branches/branch-0.23.2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeMapRed.java
Modified: hadoop/common/branches/branch-0.23.2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeMapRed.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeMapRed.java?rev=1294748&r1=1294747&r2=1294748&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23.2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeMapRed.java (original)
+++ hadoop/common/branches/branch-0.23.2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeMapRed.java Tue Feb 28 17:46:40 2012
@@ -521,11 +521,15 @@ public abstract class PipeMapRed {
LOG.info("mapRedFinished");
return;
}
- try {
- if (clientOut_ != null) {
+ if (clientOut_ != null) {
+ try {
clientOut_.flush();
clientOut_.close();
+ } catch (IOException io) {
+ LOG.warn(io);
}
+ }
+ try {
waitOutputThreads();
} catch (IOException io) {
LOG.warn(io);