Repository: hadoop Updated Branches: refs/heads/branch-2.6 0d573cc4c -> 8702cc236
HDFS-7199. DFSOutputStream should not silently drop data if DataStreamer crashes with an unchecked exception (rushabhs via cmccabe) (cherry picked from commit 56257fab1d5a7f66bebd9149c7df0436c0a57adb) (cherry picked from commit 6f7ce842c015fedb30ec762caeb37a64e8258c4a) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8702cc23 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8702cc23 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8702cc23 Branch: refs/heads/branch-2.6 Commit: 8702cc236046d67eb6d71bf8b42c6ec9eb063cc9 Parents: 0d573cc Author: Colin Patrick Mccabe <cmcc...@cloudera.com> Authored: Wed Nov 5 10:51:49 2014 -0800 Committer: Colin Patrick Mccabe <cmcc...@cloudera.com> Committed: Wed Nov 5 10:54:56 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/8702cc23/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 8c2eddd..ef40da9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -890,6 +890,9 @@ Release 2.6.0 - UNRELEASED HDFS-7305. NPE seen in wbhdfs FS while running SLive. (jing9) + HDFS-7199. DFSOutputStream should not silently drop data if DataStreamer + crashes with an unchecked exception (rushabhs via cmccabe) + BREAKDOWN OF HDFS-6584 ARCHIVAL STORAGE HDFS-6677. Change INodeFile and FSImage to support storage policy ID. http://git-wip-us.apache.org/repos/asf/hadoop/blob/8702cc23/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) {