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 ey...@apache.org on 2015/09/16 05:04:15 UTC
hadoop git commit: HADOOP-12374. Updated expunge command description.
(WeiWei Yang via eyang)
Repository: hadoop
Updated Branches:
refs/heads/trunk 77aaf4cf7 -> 2ffe2db95
HADOOP-12374. Updated expunge command description.
(WeiWei Yang via eyang)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2ffe2db9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2ffe2db9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2ffe2db9
Branch: refs/heads/trunk
Commit: 2ffe2db95ede7f30aeaece4619db7eb08b84280e
Parents: 77aaf4c
Author: Eric Yang <ey...@apache.org>
Authored: Tue Sep 15 20:03:24 2015 -0700
Committer: Eric Yang <ey...@apache.org>
Committed: Tue Sep 15 20:03:24 2015 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../src/main/java/org/apache/hadoop/fs/shell/Delete.java | 7 +++++--
.../hadoop-common/src/site/markdown/FileSystemShell.md | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2ffe2db9/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 b637358..8ae0128 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -819,6 +819,9 @@ Release 2.8.0 - UNRELEASED
BUG FIXES
+ HADOOP-12374. Updated expunge command description.
+ (WeiWei Yang via eyang)
+
HADOOP-12352. Delay in checkpointing Trash can leave trash for 2 intervals
before deleting (Casey Brotherton via harsh)
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2ffe2db9/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
index ec45d17..6983eb9 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
@@ -215,11 +215,14 @@ class Delete {
}
}
- /** empty the trash */
+ // delete files from the trash that are older
+ // than the retention threshold.
static class Expunge extends FsCommand {
public static final String NAME = "expunge";
public static final String USAGE = "";
- public static final String DESCRIPTION = "Empty the Trash";
+ public static final String DESCRIPTION =
+ "Delete files from the trash that are older " +
+ "than the retention threshold";
// TODO: should probably allow path arguments for the filesystems
@Override
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2ffe2db9/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md b/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md
index d6d00e4..2ea5aba 100644
--- a/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md
+++ b/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md
@@ -271,7 +271,7 @@ expunge
Usage: `hadoop fs -expunge`
-Empty the Trash. Refer to the [HDFS Architecture Guide](../hadoop-hdfs/HdfsDesign.html) for more information on the Trash feature.
+If trash is enabled when a file is deleted, HDFS instead moves the deleted file to a trash directory. This command causes HDFS to permanently delete files from the trash that are older than the retention threshold. Refer to the [File Deletes and Undeletes Guide](../hadoop-hdfs/HdfsDesign.html#File_Deletes_and_Undeletes) in Space Reclamation section for more information on the Trash feature.
find
----