Return-Path: Delivered-To: apmail-hadoop-core-commits-archive@www.apache.org Received: (qmail 10457 invoked from network); 19 Dec 2008 01:42:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Dec 2008 01:42:39 -0000 Received: (qmail 35607 invoked by uid 500); 19 Dec 2008 01:42:51 -0000 Delivered-To: apmail-hadoop-core-commits-archive@hadoop.apache.org Received: (qmail 35571 invoked by uid 500); 19 Dec 2008 01:42:51 -0000 Mailing-List: contact core-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: core-dev@hadoop.apache.org Delivered-To: mailing list core-commits@hadoop.apache.org Received: (qmail 35562 invoked by uid 99); 19 Dec 2008 01:42:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Dec 2008 17:42:51 -0800 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= 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, 19 Dec 2008 01:42:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CC18B238899B; Thu, 18 Dec 2008 17:42:11 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r727883 - in /hadoop/core/branches/branch-0.20: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeDirectoryWithQuota.java Date: Fri, 19 Dec 2008 01:42:11 -0000 To: core-commits@hadoop.apache.org From: shv@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081219014211.CC18B238899B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: shv Date: Thu Dec 18 17:42:11 2008 New Revision: 727883 URL: http://svn.apache.org/viewvc?rev=727883&view=rev Log: HADOOP-4771. Merge -r 727238:727239 from trunk to branch 0.20. Modified: hadoop/core/branches/branch-0.20/CHANGES.txt hadoop/core/branches/branch-0.20/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeDirectoryWithQuota.java Modified: hadoop/core/branches/branch-0.20/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=727883&r1=727882&r2=727883&view=diff ============================================================================== --- hadoop/core/branches/branch-0.20/CHANGES.txt (original) +++ hadoop/core/branches/branch-0.20/CHANGES.txt Thu Dec 18 17:42:11 2008 @@ -449,6 +449,9 @@ HADOOP-4791. Fix rpm build process for Chukwa. (Eric Yang via cdouglas) + HADOOP-4771. Correct initialization of the file count for directories + with quotas. (Ruyue Ma via shv) + HADOOP-4878. Fix eclipse plugin classpath file to point to ivy's resolved lib directory and added the same to test-patch.sh. (Giridharan Kesavan via acmurthy) Modified: hadoop/core/branches/branch-0.20/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeDirectoryWithQuota.java URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeDirectoryWithQuota.java?rev=727883&r1=727882&r2=727883&view=diff ============================================================================== --- hadoop/core/branches/branch-0.20/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeDirectoryWithQuota.java (original) +++ hadoop/core/branches/branch-0.20/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeDirectoryWithQuota.java Thu Dec 18 17:42:11 2008 @@ -53,6 +53,7 @@ super(permissions, modificationTime); this.nsQuota = nsQuota; this.dsQuota = dsQuota; + this.nsCount = 1; } /** constructor with no quota verification */ @@ -62,6 +63,7 @@ super(name, permissions); this.nsQuota = nsQuota; this.dsQuota = dsQuota; + this.nsCount = 1; } /** Get this directory's namespace quota