You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ra...@apache.org on 2016/12/15 09:04:31 UTC
[03/50] [abbrv] hadoop git commit: HDFS-11140. Directory Scanner
should log startup message time correctly. Contributed by Yiqun Lin.
HDFS-11140. Directory Scanner should log startup message time correctly. Contributed by Yiqun Lin.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9ef89ede
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9ef89ede
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9ef89ede
Branch: refs/heads/HDFS-10285
Commit: 9ef89ede2f18c76c601fd585cb9d47511f5fc3ed
Parents: deb4743
Author: Akira Ajisaka <aa...@apache.org>
Authored: Thu Dec 8 13:38:02 2016 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Thu Dec 8 13:38:02 2016 +0900
----------------------------------------------------------------------
.../hadoop/hdfs/server/datanode/DirectoryScanner.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9ef89ede/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
index e2baf32..18188dd 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
@@ -37,6 +37,8 @@ import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
+
+import org.apache.commons.lang.time.FastDateFormat;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience;
@@ -61,7 +63,7 @@ public class DirectoryScanner implements Runnable {
private static final int MILLIS_PER_SECOND = 1000;
private static final String START_MESSAGE =
"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
+ " and throttle limit of %dms/s";
@@ -268,10 +270,12 @@ public class DirectoryScanner implements Runnable {
String logMsg;
if (throttleLimitMsPerSec < MILLIS_PER_SECOND) {
- logMsg = String.format(START_MESSAGE_WITH_THROTTLE, firstScanTime,
- scanPeriodMsecs, throttleLimitMsPerSec);
+ logMsg = String.format(START_MESSAGE_WITH_THROTTLE,
+ FastDateFormat.getInstance().format(firstScanTime), scanPeriodMsecs,
+ throttleLimitMsPerSec);
} else {
- logMsg = String.format(START_MESSAGE, firstScanTime, scanPeriodMsecs);
+ logMsg = String.format(START_MESSAGE,
+ FastDateFormat.getInstance().format(firstScanTime), scanPeriodMsecs);
}
LOG.info(logMsg);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org