Repository: hadoop Updated Branches: refs/heads/branch-2 03c292efb -> 066478202
HDFS-9439. Include status of closeAck into exception message in DataNode#run. (Xiao Chen via Yongjun Zhang) (cherry picked from commit 31dc5c650e3fcfd5b581cbc1132b895d3eadaf49) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/06647820 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/06647820 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/06647820 Branch: refs/heads/branch-2 Commit: 06647820250f3a41b281833f56c197f03a9a7173 Parents: 03c292e Author: Yongjun Zhang <[email protected]> Authored: Thu Nov 19 14:20:33 2015 -0800 Committer: Yongjun Zhang <[email protected]> Committed: Thu Nov 19 14:22:44 2015 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/hdfs/server/datanode/DataNode.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/06647820/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 54fefb4..64ed893 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -801,6 +801,9 @@ Release 2.8.0 - UNRELEASED HDFS-8056. Decommissioned dead nodes should continue to be counted as dead after NN restart. (mingma) + HDFS-9439. Include status of closeAck into exception message in DataNode#run. + (Xiao Chen via Yongjun Zhang) + OPTIMIZATIONS HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than http://git-wip-us.apache.org/repos/asf/hadoop/blob/06647820/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java index 469a36a..44f5a01 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java @@ -2251,7 +2251,7 @@ public class DataNode extends ReconfigurableBase + Arrays.asList(targets)); } else { throw new IOException("Bad connect ack, targets=" - + Arrays.asList(targets)); + + Arrays.asList(targets) + " status=" + closeAck.getStatus()); } } } else {
