big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-5560. Trash configuration log statements prints incorrect units. Contributed by Josh Elser.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1547266 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andrew Wang 2013-12-03 03:31:21 +00:00
parent c58ae266e9
commit 9b08654536
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -519,6 +519,9 @@ Release 2.3.0 - UNRELEASED
HADOOP-10130. RawLocalFS::LocalFSFileInputStream.pread does not track HADOOP-10130. RawLocalFS::LocalFSFileInputStream.pread does not track
FS::Statistics (Binglin Chang via Colin Patrick McCabe) 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 Release 2.2.0 - 2013-10-13
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
View File

@ -90,8 +90,8 @@ public void initialize(Configuration conf, FileSystem fs, Path home) {
FS_TRASH_CHECKPOINT_INTERVAL_KEY, FS_TRASH_CHECKPOINT_INTERVAL_DEFAULT) FS_TRASH_CHECKPOINT_INTERVAL_KEY, FS_TRASH_CHECKPOINT_INTERVAL_DEFAULT)
* MSECS_PER_MINUTE); * MSECS_PER_MINUTE);
LOG.info("Namenode trash configuration: Deletion interval = " + LOG.info("Namenode trash configuration: Deletion interval = " +
this.deletionInterval + " minutes, Emptier interval = " + (this.deletionInterval / MSECS_PER_MINUTE) + " minutes, Emptier interval = " +
this.emptierInterval + " minutes."); (this.emptierInterval / MSECS_PER_MINUTE) + " minutes.");
} }
private Path makeTrashRelativePath(Path basePath, Path rmFilePath) { private Path makeTrashRelativePath(Path basePath, Path rmFilePath) {