Repository: hadoop Updated Branches: refs/heads/branch-2.7 a36f090c5 -> 849b47525
HDFS-8659. Block scanner INFO message is spamming logs. Contributed by Yongjun Zhang. (cherry picked from commit 43a1288fff5e323895fde66b9e3eb31a7412fcc2) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/849b4752 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/849b4752 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/849b4752 Branch: refs/heads/branch-2.7 Commit: 849b47525dbfcccd78ca92648443d4161d2686b8 Parents: a36f090 Author: Yongjun Zhang <[email protected]> Authored: Mon Jun 29 14:35:39 2015 -0700 Committer: Yongjun Zhang <[email protected]> Committed: Mon Jun 29 14:56:14 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ .../org/apache/hadoop/hdfs/server/datanode/BlockScanner.java | 2 +- .../apache/hadoop/hdfs/server/datanode/VolumeScanner.java | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/849b4752/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 7a221ee..d4444d3 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -8,6 +8,8 @@ Release 2.7.2 - UNRELEASED IMPROVEMENTS + HDFS-8659. Block scanner INFO message is spamming logs. (Yongjun Zhang) + OPTIMIZATIONS BUG FIXES http://git-wip-us.apache.org/repos/asf/hadoop/blob/849b4752/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockScanner.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockScanner.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockScanner.java index 9c4dd10..be6aa83 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockScanner.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockScanner.java @@ -317,7 +317,7 @@ public class BlockScanner { */ synchronized void markSuspectBlock(String storageId, ExtendedBlock block) { if (!isEnabled()) { - LOG.info("Not scanning suspicious block {} on {}, because the block " + + LOG.debug("Not scanning suspicious block {} on {}, because the block " + "scanner is disabled.", block, storageId); return; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/849b4752/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/VolumeScanner.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/VolumeScanner.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/VolumeScanner.java index 615abe9..ff655c2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/VolumeScanner.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/VolumeScanner.java @@ -656,24 +656,24 @@ public class VolumeScanner extends Thread { public synchronized void markSuspectBlock(ExtendedBlock block) { if (stopping) { - LOG.info("{}: Not scheduling suspect block {} for " + + LOG.debug("{}: Not scheduling suspect block {} for " + "rescanning, because this volume scanner is stopping.", this, block); return; } Boolean recent = recentSuspectBlocks.getIfPresent(block); if (recent != null) { - LOG.info("{}: Not scheduling suspect block {} for " + + LOG.debug("{}: Not scheduling suspect block {} for " + "rescanning, because we rescanned it recently.", this, block); return; } if (suspectBlocks.contains(block)) { - LOG.info("{}: suspect block {} is already queued for " + + LOG.debug("{}: suspect block {} is already queued for " + "rescanning.", this, block); return; } suspectBlocks.add(block); recentSuspectBlocks.put(block, true); - LOG.info("{}: Scheduling suspect block {} for rescanning.", this, block); + LOG.debug("{}: Scheduling suspect block {} for rescanning.", this, block); notify(); // wake scanner thread. }
