hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From umamah...@apache.org
Subject hadoop git commit: HDFS-6285. tidy an error log inside BlockReceiver. Contributed by Liang Xie.
Date Fri, 08 May 2015 11:55:51 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 d129bbbb3 -> faf26f081


HDFS-6285. tidy an error log inside BlockReceiver. Contributed by Liang Xie.

(cherry picked from commit 7b1ea9c481fb8c13fc7b64eb1894d96ddfbf4b5b)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/faf26f08
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/faf26f08
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/faf26f08

Branch: refs/heads/branch-2
Commit: faf26f081cb2472af882983354262f903ab3942b
Parents: d129bbb
Author: Uma Maheswara Rao G <umamahesh@apache.org>
Authored: Fri May 8 17:22:52 2015 +0530
Committer: Uma Maheswara Rao G <umamahesh@apache.org>
Committed: Fri May 8 17:25:07 2015 +0530

----------------------------------------------------------------------
 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/faf26f08/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 0cc149c..b158d2a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -366,6 +366,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/faf26f08/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;


Mime
View raw message