Author: wang
Date: Tue Dec 3 03:34:00 2013
New Revision: 1547268
URL: http://svn.apache.org/r1547268
Log:
HDFS-5560. Trash configuration log statements prints incorrect units.
Contributed by Josh Elser.
Modified:
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
Modified:
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1547268&r1=1547267&r2=1547268&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
Tue Dec 3 03:34:00 2013
@@ -67,6 +67,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
Modified:
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java?rev=1547268&r1=1547267&r2=1547268&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
(original)
+++
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
Tue Dec 3 03:34:00 2013
@@ -90,8 +90,8 @@ public class TrashPolicyDefault extends
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) {
