From 73ef77c12fc672df9a38a7dbb53c366960a26625 Mon Sep 17 00:00:00 2001 From: Masatake Iwasaki Date: Fri, 22 Jan 2016 14:12:06 +0900 Subject: [PATCH] HDFS-9618. Fix mismatch between log level and guard in BlockManager#computeRecoveryWorkForBlocks (iwasakims) --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hadoop/hdfs/server/blockmanagement/BlockManager.java | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 31fa3796e20..49df3103ec8 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -57,6 +57,9 @@ Release 2.9.0 - UNRELEASED HDFS-9601. NNThroughputBenchmark.BlockReportStats should handle NotReplicatedYetException on adding block (iwasakims) + HDFS-9618. Fix mismatch between log level and guard in + BlockManager#computeRecoveryWorkForBlocks (iwasakims) + HDFS-9621. Consolidate FSDirStatAndListingOp#createFileStatus to let its INodesInPath parameter always include the target INode. (jing9) 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 ab596ffeeb3..30897ab0363 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 @@ -1389,7 +1389,7 @@ int computeReplicationWorkForBlocks(List> blocksToReplicate) { namesystem.writeUnlock(); } - if (blockLog.isInfoEnabled()) { + if (blockLog.isDebugEnabled()) { // log which blocks have been scheduled for replication for(ReplicationWork rw : work){ DatanodeStorageInfo[] targets = rw.getTargets(); @@ -1403,8 +1403,7 @@ int computeReplicationWorkForBlocks(List> blocksToReplicate) { rw.getBlock(), targetList); } } - } - if (blockLog.isDebugEnabled()) { + blockLog.debug("BLOCK* neededReplications = {} pendingReplications = {}", neededReplications.size(), pendingReplications.size()); }