You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@hbase.apache.org by st...@apache.org on 2012/03/23 22:18:42 UTC

svn commit: r1304603 - /hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java

Author: stack
Date: Fri Mar 23 21:18:41 2012
New Revision: 1304603

URL: http://svn.apache.org/viewvc?rev=1304603&view=rev
Log:
HBASE-5624 Aborting regionserver when splitting region, may cause daughter region not assigned by ServerShutdownHandler

Modified:
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java?rev=1304603&r1=1304602&r2=1304603&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java Fri Mar 23 21:18:41 2012
@@ -340,9 +340,9 @@ public class SplitTransaction {
     if (stopped || stopping) {
       // add 2nd daughter first (see HBASE-4335)
       MetaEditor.addDaughter(server.getCatalogTracker(),
-          b.getRegionInfo(), null);
+          b.getRegionInfo(), services.getServerName());
       MetaEditor.addDaughter(server.getCatalogTracker(),
-          a.getRegionInfo(), null);
+          a.getRegionInfo(), services.getServerName());
       LOG.info("Not opening daughters " +
           b.getRegionInfo().getRegionNameAsString() +
           " and " +