You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by vi...@apache.org on 2015/05/29 13:22:48 UTC
[1/2] hadoop git commit: HADOOP-12042. Users may see TrashPolicy if
hdfs dfs -rm is run (Contributed by Andreina J)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 983c1d396 -> 09d68d645
refs/heads/trunk b75df697e -> 7366e4256
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/7366e425
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7366e425
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7366e425
Branch: refs/heads/trunk
Commit: 7366e4256395ed7550702275d0d9f2674bd43d6c
Parents: b75df69
Author: Vinayakumar B <vi...@apache.org>
Authored: Fri May 29 16:51:23 2015 +0530
Committer: Vinayakumar B <vi...@apache.org>
Committed: Fri May 29 16:51:23 2015 +0530
----------------------------------------------------------------------
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/7366e425/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/7366e425/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
[2/2] hadoop git commit: HADOOP-12042. Users may see TrashPolicy if
hdfs dfs -rm is run (Contributed by Andreina J)
Posted by vi...@apache.org.
HADOOP-12042. Users may see TrashPolicy if hdfs dfs -rm is run (Contributed by Andreina J)
(cherry picked from commit 7366e4256395ed7550702275d0d9f2674bd43d6c)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/09d68d64
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/09d68d64
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/09d68d64
Branch: refs/heads/branch-2
Commit: 09d68d645a0441f0435b9c0b793ff679c1f65201
Parents: 983c1d3
Author: Vinayakumar B <vi...@apache.org>
Authored: Fri May 29 16:51:23 2015 +0530
Committer: Vinayakumar B <vi...@apache.org>
Committed: Fri May 29 16:52:23 2015 +0530
----------------------------------------------------------------------
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/09d68d64/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 cacb2ad..398e7c3 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -315,6 +315,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/09d68d64/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