hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject svn commit: r1205959 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java
Date Thu, 24 Nov 2011 19:03:46 GMT
Author: tedyu
Date: Thu Nov 24 19:03:46 2011
New Revision: 1205959

URL: http://svn.apache.org/viewvc?rev=1205959&view=rev
Log:
HBASE-4855  SplitLogManager hangs on cluster restart due to batch.installed doubly counted

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1205959&r1=1205958&r2=1205959&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Thu Nov 24 19:03:46 2011
@@ -446,6 +446,7 @@ Release 0.92.0 - Unreleased
                AuthenticationTokenSecretManager/ZKLeaderManager
    HBASE-4739  Master dying while going to close a region can leave it in transition
                forever (Gao Jinchao)
+   HBASE-4855  SplitLogManager hangs on cluster restart due to batch.installed doubly counted
 
   TESTS
    HBASE-4450  test for number of blocks read: to serve as baseline for expected

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java?rev=1205959&r1=1205958&r2=1205959&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java Thu Nov
24 19:03:46 2011
@@ -741,7 +741,9 @@ public class SplitLogManager extends Zoo
       }
       this.batch = batch;
       if (batch != null) {
-        batch.installed++;
+        if (this.incarnation == 0) {
+          batch.installed++;
+        }
       }
     }
 



Mime
View raw message