HADOOP-12042. Users may see TrashPolicy if hdfs dfs -rm is run (Contributed by Andreina J)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ab02e318 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ab02e318 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ab02e318 Branch: refs/heads/YARN-2928 Commit: ab02e3187cbabe9b20a730f0d4f7f775f8c1134f Parents: 0f26da6 Author: Vinayakumar B <vinayakum...@apache.org> Authored: Fri May 29 16:51:23 2015 +0530 Committer: Zhijie Shen <zjs...@apache.org> Committed: Tue Jun 2 16:12:57 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../main/java/org/apache/hadoop/fs/TrashPolicyDefault.java | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ab02e318/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index af82c0b..bc74696 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -797,6 +797,9 @@ Release 2.8.0 - UNRELEASED HADOOP-11959. WASB should configure client side socket timeout in storage client blob request options. (Ivan Mitic via cnauroth) + HADOOP-12042. Users may see TrashPolicy if hdfs dfs -rm is run + (Andreina J via vinayakumarb) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/ab02e318/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java ---------------------------------------------------------------------- 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 d6a9b4b..88aeab5 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 @@ -89,9 +89,6 @@ public class TrashPolicyDefault extends TrashPolicy { this.emptierInterval = (long)(conf.getFloat( FS_TRASH_CHECKPOINT_INTERVAL_KEY, FS_TRASH_CHECKPOINT_INTERVAL_DEFAULT) * MSECS_PER_MINUTE); - LOG.info("Namenode trash configuration: Deletion interval = " + - (this.deletionInterval / MSECS_PER_MINUTE) + " minutes, Emptier interval = " + - (this.emptierInterval / MSECS_PER_MINUTE) + " minutes."); } private Path makeTrashRelativePath(Path basePath, Path rmFilePath) { @@ -251,6 +248,10 @@ public class TrashPolicyDefault extends TrashPolicy { " minutes that is used for deletion instead"); this.emptierInterval = deletionInterval; } + LOG.info("Namenode trash configuration: Deletion interval = " + + (deletionInterval / MSECS_PER_MINUTE) + + " minutes, Emptier interval = " + + (emptierInterval / MSECS_PER_MINUTE) + " minutes."); } @Override
