Return-Path: Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: (qmail 42206 invoked from network); 30 Oct 2009 22:39:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 30 Oct 2009 22:39:25 -0000 Received: (qmail 41429 invoked by uid 500); 30 Oct 2009 22:39:25 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 41364 invoked by uid 500); 30 Oct 2009 22:39:25 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 41353 invoked by uid 99); 30 Oct 2009 22:39:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Oct 2009 22:39:25 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Oct 2009 22:39:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8D55D23888C2; Fri, 30 Oct 2009 22:39:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r831478 - in /hadoop/common/trunk: CHANGES.txt src/java/org/apache/hadoop/fs/Trash.java Date: Fri, 30 Oct 2009 22:39:02 -0000 To: common-commits@hadoop.apache.org From: suresh@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091030223902.8D55D23888C2@eris.apache.org> Author: suresh Date: Fri Oct 30 22:39:01 2009 New Revision: 831478 URL: http://svn.apache.org/viewvc?rev=831478&view=rev Log: HADOOP-6344. Fix rm and rmr immediately delete files rather than sending to trash, if a user is over-quota. Contributed by Jakob Homan. Modified: hadoop/common/trunk/CHANGES.txt 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=831478&r1=831477&r2=831478&view=diff ============================================================================== --- hadoop/common/trunk/CHANGES.txt (original) +++ hadoop/common/trunk/CHANGES.txt Fri Oct 30 22:39:01 2009 @@ -1139,6 +1139,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/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=831478&r1=831477&r2=831478&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 Fri Oct 30 22:39:01 2009 @@ -128,7 +128,8 @@ } } catch (IOException e) { LOG.warn("Can't create trash directory: "+baseTrashPath); - return false; + cause = e; + break; } try { //