Repository: hadoop Updated Branches: refs/heads/branch-2 3de3640e4 -> 8d8eb8dce
HDFS-7425. NameNode block deletion logging uses incorrect appender. Contributed by Chris Nauroth. (cherry picked from commit b8c094b0754099f13d668081b4afcf0644e325c3) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8d8eb8dc Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8d8eb8dc Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8d8eb8dc Branch: refs/heads/branch-2 Commit: 8d8eb8dcec94e92d94eedef883cdece8ba333087 Parents: 3de3640 Author: cnauroth <[email protected]> Authored: Fri Nov 21 16:36:31 2014 -0800 Committer: cnauroth <[email protected]> Committed: Fri Nov 21 16:56:17 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/8d8eb8dc/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 2a99645..2960aa5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -216,6 +216,21 @@ Release 2.7.0 - UNRELEASED HDFS-7374. Allow decommissioning of dead DataNodes. (Zhe Zhang) +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/8d8eb8dc/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 e23f39a..73c3a23 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 @@ -3423,8 +3423,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();
