Author: suresh
Date: Fri Oct 30 22:41:18 2009
New Revision: 831479
URL: http://svn.apache.org/viewvc?rev=831479&view=rev
Log:
HADOOP-6344. Integrating change 831478 from trunk to branch 0.21. Contributed
by Jakob Homan.
Modified:
hadoop/common/branches/branch-0.21/CHANGES.txt
hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/fs/Trash.java
Modified: hadoop/common/branches/branch-0.21/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/CHANGES.txt?rev=831479&r1=831478&r2=831479&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.21/CHANGES.txt Fri Oct 30 22:41:18 2009
@@ -1103,6 +1103,9 @@
-libjars and -archives options and fix Path to support URI with fragment.
(Amareshwari Sriramadasu via szetszwo)
+ HADOOP-6344. Fix rm and rmr immediately delete files rather than sending
+ to trash, if a user is over-quota. (Jakob Homan via suresh)
+
Release 0.20.2 - Unreleased
NEW FEATURES
Modified:
hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/fs/Trash.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/fs/Trash.java?rev=831479&r1=831478&r2=831479&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/fs/Trash.java
(original)
+++ hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/fs/Trash.java
Fri Oct 30 22:41:18 2009
@@ -128,7 +128,8 @@
}
} catch (IOException e) {
LOG.warn("Can't create trash directory: "+baseTrashPath);
- return false;
+ cause = e;
+ break;
}
try {
//
