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 cm...@apache.org on 2014/11/05 19:52:27 UTC
git commit: HDFS-7199. DFSOutputStream should not silently drop data
if DataStreamer crashes with an unchecked exception (rushabhs via cmccabe)
(cherry picked from commit 56257fab1d5a7f66bebd9149c7df0436c0a57adb)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 1ef616ceb -> 6f7ce842c
HDFS-7199. DFSOutputStream should not silently drop data if DataStreamer crashes with an unchecked exception (rushabhs via cmccabe)
(cherry picked from commit 56257fab1d5a7f66bebd9149c7df0436c0a57adb)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6f7ce842
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6f7ce842
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6f7ce842
Branch: refs/heads/branch-2
Commit: 6f7ce842c015fedb30ec762caeb37a64e8258c4a
Parents: 1ef616c
Author: Colin Patrick Mccabe <cm...@cloudera.com>
Authored: Wed Nov 5 10:51:49 2014 -0800
Committer: Colin Patrick Mccabe <cm...@cloudera.com>
Committed: Wed Nov 5 10:52:19 2014 -0800
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java | 2 ++
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6f7ce842/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index f420e2e..d148b86 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -145,6 +145,9 @@ Release 2.7.0 - UNRELEASED
HDFS-7324. haadmin command usage prints incorrect command name.
(Brahma Reddy Battula via suresh)
+ HDFS-7199. DFSOutputStream should not silently drop data if DataStreamer
+ crashes with an unchecked exception (rushabhs via cmccabe)
+
Release 2.6.0 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6f7ce842/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
index 6cbf27a..92dbc8e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
@@ -692,6 +692,8 @@ public class DFSOutputStream extends FSOutputSummer
}
if (e instanceof IOException) {
setLastException((IOException)e);
+ } else {
+ setLastException(new IOException("DataStreamer Exception: ",e));
}
hasError = true;
if (errorIndex == -1 && restartingNodeIndex == -1) {