svn commit: r1597839 - in /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt src/main/java/org/apache/hadoop/hdfs/server/namenode/ContentSummaryComputationContext.java

[kihwal]

Author: kihwal
Date: Tue May 27 18:00:01 2014
New Revision: 1597839

URL: http://svn.apache.org/r1597839
Log:
HDFS-6449. Incorrect counting in ContentSummaryComputationContext in 0.23. 
Contributed by Kihwal Lee.

Modified:
    
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
    
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ContentSummaryComputationContext.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1597839&r1=1597838&r2=1597839&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
(original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
Tue May 27 18:00:01 2014
@@ -27,6 +27,9 @@ Release 0.23.11 - UNRELEASED
     HDFS-5728. Block recovery will fail if the metafile does not have crc 
     for all chunks of the block. (Vinayakumar B via kihwal)
 
+    HDFS-6449. Incorrect counting in ContentSummaryComputationContext in 0.23.
+    (kihwal)
+
 Release 0.23.10 - 2013-12-09
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ContentSummaryComputationContext.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ContentSummaryComputationContext.java?rev=1597839&r1=1597838&r2=1597839&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ContentSummaryComputationContext.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ContentSummaryComputationContext.java
 Tue May 27 18:00:01 2014
@@ -72,8 +72,7 @@ public class ContentSummaryComputationCo
     }
 
     // Have we reached the limit?
-    long currentCount = counts[0] + counts[1] + counts[2] +
-        counts[3];
+    long currentCount = counts[1] + counts[2];
     if (currentCount <= nextCountLimit) {
       return false;
     }