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 zj...@apache.org on 2015/05/09 02:42:00 UTC
[06/50] hadoop git commit: HDFS-6285. tidy an error log inside
BlockReceiver. Contributed by Liang Xie.
HDFS-6285. tidy an error log inside BlockReceiver. Contributed by Liang Xie.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2a71ed25
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2a71ed25
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2a71ed25
Branch: refs/heads/YARN-2928
Commit: 2a71ed258ea2e332eb6dcfac4255b294ee1b4f5b
Parents: 2cf8db4
Author: Uma Maheswara Rao G <um...@apache.org>
Authored: Fri May 8 17:22:52 2015 +0530
Committer: Zhijie Shen <zj...@apache.org>
Committed: Fri May 8 17:32:46 2015 -0700
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++
.../org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2a71ed25/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 4decfd8..60825a2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -693,6 +693,8 @@ Release 2.8.0 - UNRELEASED
HDFS-3384. DataStreamer thread should be closed immediatly when failed to
setup a PipelineForAppendOrRecovery (Uma Maheswara Rao G via vinayakumarb)
+ HDFS-6285. tidy an error log inside BlockReceiver. (Liang Xie via umamahesh)
+
Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2a71ed25/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
index 90e2194..2e11600 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
@@ -262,8 +262,8 @@ class BlockReceiver implements Closeable {
// check if there is a disk error
IOException cause = DatanodeUtil.getCauseIfDiskError(ioe);
- DataNode.LOG.warn("IOException in BlockReceiver constructor. Cause is ",
- cause);
+ DataNode.LOG.warn("IOException in BlockReceiver constructor"
+ + (cause == null ? "" : ". Cause is "), cause);
if (cause != null) { // possible disk error
ioe = cause;