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 sh...@apache.org on 2008/12/19 02:42:11 UTC

svn commit: r727883 - in /hadoop/core/branches/branch-0.20: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeDirectoryWithQuota.java

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