Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-11140. Directory Scanner should log startup message time correctly. Contributed by Yiqun Lin. 

(cherry picked from commit 9ef89ede2f)
This commit is contained in:
Akira Ajisaka 2016-12-08 13:38:02 +09:00
parent 4b21b47f56
commit e00a124cb5
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
View File

@ -40,11 +40,11 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.apache.commons.lang.time.FastDateFormat;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.hdfs.DFSConfigKeys; import org.apache.hadoop.hdfs.DFSConfigKeys;
import org.apache.hadoop.hdfs.protocol.Block; import org.apache.hadoop.hdfs.protocol.Block;
import org.apache.hadoop.hdfs.protocol.HdfsConstants; import org.apache.hadoop.hdfs.protocol.HdfsConstants;
@ -66,7 +66,7 @@ public class DirectoryScanner implements Runnable {
private static final int MILLIS_PER_SECOND = 1000; private static final int MILLIS_PER_SECOND = 1000;
private static final String START_MESSAGE = private static final String START_MESSAGE =
"Periodic Directory Tree Verification scan" "Periodic Directory Tree Verification scan"
+ " starting at %dms with interval of %dms"; + " starting at %s with interval of %dms";
private static final String START_MESSAGE_WITH_THROTTLE = START_MESSAGE private static final String START_MESSAGE_WITH_THROTTLE = START_MESSAGE
+ " and throttle limit of %dms/s"; + " and throttle limit of %dms/s";
@ -465,10 +465,12 @@ public class DirectoryScanner implements Runnable {
String logMsg; String logMsg;
if (throttleLimitMsPerSec < MILLIS_PER_SECOND) { if (throttleLimitMsPerSec < MILLIS_PER_SECOND) {
logMsg = String.format(START_MESSAGE_WITH_THROTTLE, firstScanTime, logMsg = String.format(START_MESSAGE_WITH_THROTTLE,
scanPeriodMsecs, throttleLimitMsPerSec); FastDateFormat.getInstance().format(firstScanTime), scanPeriodMsecs,
throttleLimitMsPerSec);
} else { } else {
logMsg = String.format(START_MESSAGE, firstScanTime, scanPeriodMsecs); logMsg = String.format(START_MESSAGE,
FastDateFormat.getInstance().format(firstScanTime), scanPeriodMsecs);
} }
LOG.info(logMsg); LOG.info(logMsg);