Repository: hadoop Updated Branches: refs/heads/trunk 0857641f6 -> deb4743b2
Revert "HDFS-11140. Directory Scanner should log startup message time correctly. Contributed by Yiqun Lin." This reverts commit 0857641f62778fad64e8158d78320efb0c8b417c. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/deb4743b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/deb4743b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/deb4743b Branch: refs/heads/trunk Commit: deb4743b2c3bb5c23842f0e224b89e41ef2d36d4 Parents: 0857641 Author: Akira Ajisaka <aajis...@apache.org> Authored: Thu Dec 8 13:37:06 2016 +0900 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Thu Dec 8 13:37:06 2016 +0900 ---------------------------------------------------------------------- .../java/org/apache/hadoop/fs/RawLocalFileSystem.java | 9 --------- .../hadoop/hdfs/server/datanode/DirectoryScanner.java | 12 ++++-------- 2 files changed, 4 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/deb4743b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java index 84863a5..7bf429e 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java @@ -791,15 +791,6 @@ public class RawLocalFileSystem extends FileSystem { pathToFile(p).toPath(), BasicFileAttributeView.class); FileTime fmtime = (mtime >= 0) ? FileTime.fromMillis(mtime) : null; FileTime fatime = (atime >= 0) ? FileTime.fromMillis(atime) : null; - - // On some macOS environment, BasicFileAttributeView.setTimes - // does not set times correctly when the argument of accessTime is null. - // TODO: Remove this after the issue is fixed. - if (fatime == null && Shell.MAC) { - FileStatus f = getFileStatus(p); - fatime = FileTime.fromMillis(f.getAccessTime()); - } - view.setTimes(fmtime, fatime, null); } catch (NoSuchFileException e) { throw new FileNotFoundException("File " + p + " does not exist"); http://git-wip-us.apache.org/repos/asf/hadoop/blob/deb4743b/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 18188dd..e2baf32 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,8 +37,6 @@ 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; @@ -63,7 +61,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 %s with interval of %dms"; + + " starting at %dms with interval of %dms"; private static final String START_MESSAGE_WITH_THROTTLE = START_MESSAGE + " and throttle limit of %dms/s"; @@ -270,12 +268,10 @@ public class DirectoryScanner implements Runnable { String logMsg; if (throttleLimitMsPerSec < MILLIS_PER_SECOND) { - logMsg = String.format(START_MESSAGE_WITH_THROTTLE, - FastDateFormat.getInstance().format(firstScanTime), scanPeriodMsecs, - throttleLimitMsPerSec); + logMsg = String.format(START_MESSAGE_WITH_THROTTLE, firstScanTime, + scanPeriodMsecs, throttleLimitMsPerSec); } else { - logMsg = String.format(START_MESSAGE, - FastDateFormat.getInstance().format(firstScanTime), scanPeriodMsecs); + logMsg = String.format(START_MESSAGE, firstScanTime, scanPeriodMsecs); } LOG.info(logMsg); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org