From 888e6309909ee4192ad23e0df79e2918b1ad77ac Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Fri, 8 May 2015 18:05:24 +0900 Subject: [PATCH] HDFS-8207. Improper log message when blockreport interval compared with initial delay. Contributed by Brahma Reddy Battula and Ashish Singhi. --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/hdfs/server/datanode/DNConf.java | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 2acd6fa515..195a946d8d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -519,6 +519,9 @@ Release 2.8.0 - UNRELEASED HDFS-8314. Move HdfsServerConstants#IO_FILE_BUFFER_SIZE and SMALL_BUFFER_SIZE to the users. (Li Lu via wheat9) + HDFS-8207. Improper log message when blockreport interval compared with + initial delay. (Brahma Reddy Battula and Ashish Singhi via ozawa) + OPTIMIZATIONS HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java index 3406f29f4c..4b7fbc3c1f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java @@ -155,8 +155,9 @@ public DNConf(Configuration conf) { DFS_BLOCKREPORT_INITIAL_DELAY_DEFAULT) * 1000L; if (initBRDelay >= blockReportInterval) { initBRDelay = 0; - DataNode.LOG.info("dfs.blockreport.initialDelay is greater than " + - "dfs.blockreport.intervalMsec." + " Setting initial delay to 0 msec:"); + DataNode.LOG.info("dfs.blockreport.initialDelay is " + + "greater than or equal to" + "dfs.blockreport.intervalMsec." + + " Setting initial delay to 0 msec:"); } initialBlockReportDelay = initBRDelay;