Repository: hadoop Updated Branches: refs/heads/branch-2 844a8e377 -> 73ef77c12
HDFS-9618. Fix mismatch between log level and guard in BlockManager#computeRecoveryWorkForBlocks (iwasakims) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/73ef77c1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/73ef77c1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/73ef77c1 Branch: refs/heads/branch-2 Commit: 73ef77c12fc672df9a38a7dbb53c366960a26625 Parents: 844a8e3 Author: Masatake Iwasaki <[email protected]> Authored: Fri Jan 22 14:12:06 2016 +0900 Committer: Masatake Iwasaki <[email protected]> Committed: Fri Jan 22 14:12:06 2016 +0900 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../apache/hadoop/hdfs/server/blockmanagement/BlockManager.java | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/73ef77c1/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 31fa379..49df310 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) http://git-wip-us.apache.org/repos/asf/hadoop/blob/73ef77c1/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 ab596ff..30897ab 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 @@ public class BlockManager implements BlockStatsMXBean { 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 @@ public class BlockManager implements BlockStatsMXBean { rw.getBlock(), targetList); } } - } - if (blockLog.isDebugEnabled()) { + blockLog.debug("BLOCK* neededReplications = {} pendingReplications = {}", neededReplications.size(), pendingReplications.size()); }
