hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cnaur...@apache.org
Subject hadoop git commit: HDFS-7425. NameNode block deletion logging uses incorrect appender. Contributed by Chris Nauroth.
Date Sat, 22 Nov 2014 00:59:34 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.6 5913c5143 -> 237993296


HDFS-7425. NameNode block deletion logging uses incorrect appender. Contributed by Chris Nauroth.

(cherry picked from commit b8c094b0754099f13d668081b4afcf0644e325c3)
(cherry picked from commit 8d8eb8dcec94e92d94eedef883cdece8ba333087)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt


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

Branch: refs/heads/branch-2.6
Commit: 23799329682083abff07a68780aeebff403f2f81
Parents: 5913c51
Author: cnauroth <cnauroth@apache.org>
Authored: Fri Nov 21 16:36:31 2014 -0800
Committer: cnauroth <cnauroth@apache.org>
Committed: Fri Nov 21 16:58:06 2014 -0800

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt          | 15 +++++++++++++++
 .../hdfs/server/blockmanagement/BlockManager.java    |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/23799329/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 15543c2..7e60f37 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1,5 +1,20 @@
 Hadoop HDFS Change Log
 
+Release 2.6.1 - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
+    HDFS-7425. NameNode block deletion logging uses incorrect appender.
+    (cnauroth)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/23799329/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
index 3e738cd..b97eeb2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
@@ -3394,8 +3394,8 @@ public class BlockManager {
     } finally {
       namesystem.writeUnlock();
     }
-    if (NameNode.stateChangeLog.isInfoEnabled()) {
-      NameNode.stateChangeLog.info("BLOCK* " + getClass().getSimpleName()
+    if (blockLog.isInfoEnabled()) {
+      blockLog.info("BLOCK* " + getClass().getSimpleName()
           + ": ask " + dn + " to delete " + toInvalidate);
     }
     return toInvalidate.size();


Mime
View raw message