Author: suresh
Date: Tue Sep 8 01:41:17 2009
New Revision: 812317
URL: http://svn.apache.org/viewvc?rev=812317&view=rev
Log:
HADOOP-6203. FsShell rm/rmr error message indicates exceeding Trash quota and
suggests using -skpTrash, when moving to trash fails. Contributed by Boris
Shkolnik.
Modified:
hadoop/common/trunk/CHANGES.txt
hadoop/common/trunk/src/java/org/apache/hadoop/fs/FsShell.java
hadoop/common/trunk/src/java/org/apache/hadoop/fs/Trash.java
Modified: hadoop/common/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=812317&r1=812316&r2=812317&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Tue Sep 8 01:41:17 2009
@@ -81,6 +81,10 @@
HADOOP-6230. Moved process tree and memory calculator related classes
from Common to Map/Reduce. (Vinod Kumar Vavilapalli via yhemanth)
+ HADOOP-6203. FsShell rm/rmr error message indicates exceeding Trash quota
+ and suggests using -skpTrash, when moving to trash fails.
+ (Boris Shkolnik via suresh)
+
NEW FEATURES
HADOOP-4268. Change fsck to use ClientProtocol methods so that the
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/FsShell.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/FsShell.java?rev=812317&r1=812316&r2=812317&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/FsShell.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/FsShell.java Tue Sep 8
01:41:17 2009
@@ -1130,10 +1130,20 @@
}
if(!skipTrash) {
- Trash trashTmp = new Trash(srcFs, getConf());
- if (trashTmp.moveToTrash(src)) {
- System.out.println("Moved to trash: " + src);
- return;
+ try {
+ Trash trashTmp = new Trash(srcFs, getConf());
+ if (trashTmp.moveToTrash(src)) {
+ System.out.println("Moved to trash: " + src);
+ return;
+ }
+ } catch (IOException e) {
+ Exception cause = (Exception) e.getCause();
+ String msg = "";
+ if(cause != null) {
+ msg = cause.getLocalizedMessage();
+ }
+ System.err.println("Problem with Trash." + msg +". Consider using
-skipTrash option");
+ throw e;
}
}
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/Trash.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/Trash.java?rev=812317&r1=812316&r2=812317&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/Trash.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/Trash.java Tue Sep 8
01:41:17 2009
@@ -123,7 +123,7 @@
for (int i = 0; i < 2; i++) {
try {
if (!fs.mkdirs(baseTrashPath, PERMISSION)) { // create current
- LOG.warn("Can't create trash directory: "+baseTrashPath);
+ LOG.warn("Can't create(mkdir) trash directory: "+baseTrashPath);
return false;
}
} catch (IOException e) {
