From 9b08654536889650c611f4a2f794822bb192650b Mon Sep 17 00:00:00 2001 From: Andrew Wang Date: Tue, 3 Dec 2013 03:31:21 +0000 Subject: [PATCH] HDFS-5560. Trash configuration log statements prints incorrect units. Contributed by Josh Elser. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1547266 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../main/java/org/apache/hadoop/fs/TrashPolicyDefault.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 8a0af47575..61d29f43ae 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -519,6 +519,9 @@ Release 2.3.0 - UNRELEASED HADOOP-10130. RawLocalFS::LocalFSFileInputStream.pread does not track FS::Statistics (Binglin Chang via Colin Patrick McCabe) + HDFS-5560. Trash configuration log statements prints incorrect units. + (Josh Elser via Andrew Wang) + Release 2.2.0 - 2013-10-13 INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java index a8f49c243f..cfb51e24ec 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java @@ -90,8 +90,8 @@ public void initialize(Configuration conf, FileSystem fs, Path home) { FS_TRASH_CHECKPOINT_INTERVAL_KEY, FS_TRASH_CHECKPOINT_INTERVAL_DEFAULT) * MSECS_PER_MINUTE); LOG.info("Namenode trash configuration: Deletion interval = " + - this.deletionInterval + " minutes, Emptier interval = " + - this.emptierInterval + " minutes."); + (this.deletionInterval / MSECS_PER_MINUTE) + " minutes, Emptier interval = " + + (this.emptierInterval / MSECS_PER_MINUTE) + " minutes."); } private Path makeTrashRelativePath(Path basePath, Path rmFilePath) {