HDFS-4984. Incorrect Quota counting in INodeFile. Contributed by Jing Zhao.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1503397 13f79535-47bb-0310-9956-ffa450edef68

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -11,6 +11,7 @@ Release 0.23.10 - UNRELEASED
   OPTIMIZATIONS
 
   BUG FIXES
+    HDFS-4984. Incorrect Quota counting in INodeFile. (jing9 via kihwal)
 
 Release 0.23.9 - 2013-07-08
 

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java

@@ -208,8 +208,9 @@ public class INodeFile extends INode {
   
   long diskspaceConsumed(Block[] blkArr) {
     long size = 0;
-    if(blkArr == null) 
+    if(blkArr == null || blocks.length == 0) { 
       return 0;
+    }
     
     for (Block blk : blkArr) {
       if (blk != null) {
@@ -219,9 +220,10 @@ public class INodeFile extends INode {
     /* If the last block is being written to, use prefferedBlockSize
      * rather than the actual block size.
      */
-    if (blkArr.length > 0 && blkArr[blkArr.length-1] != null && 
-        isUnderConstruction()) {
-      size += getPreferredBlockSize() - blkArr[blkArr.length-1].getNumBytes();
+    final int last = blkArr.length - 1;
+    if (blkArr.length > 0 && blkArr[last] != null && 
+        blkArr[last] instanceof BlockInfoUnderConstruction) {
+      size += getPreferredBlockSize() - blkArr[last].getNumBytes();
     }
     return size * getReplication();
   }