svn commit: r1066786 - in /hbase/branches/0.90: CHANGES.txt src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java

[la...@apache.org]

Author: larsgeorge
Date: Thu Feb  3 11:47:14 2011
New Revision: 1066786

URL: http://svn.apache.org/viewvc?rev=1066786&view=rev
Log:
HBASE-3495  Shell is failing on subsequent split calls

Modified:
    hbase/branches/0.90/CHANGES.txt
    hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java

Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1066786&r1=1066785&r2=1066786&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Thu Feb  3 11:47:14 2011
@@ -16,6 +16,7 @@ Release 0.90.1 - Unreleased
    	       row are the same
    HBASE-3416  For intra-row scanning, the update readers notification resets
                the query matcher and can lead to incorrect behavior
+   HBASE-3495  Shell is failing on subsequent split calls
 
 
   IMPROVEMENTS

Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java?rev=1066786&r1=1066785&r2=1066786&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java Thu Feb  3 11:47:14 2011
@@ -1075,6 +1075,10 @@ public class HBaseAdmin implements Abort
         for (Pair<HRegionInfo, HServerAddress> pair: pairs) {
           // May not be a server for a particular row
           if (pair.getSecond() == null) continue;
+          HRegionInfo r = pair.getFirst();
+          // check for parents
+          if (r.isSplitParent()) continue;
+          // call out to region server to do split now
           split(pair.getSecond(), pair.getFirst());
         }
       }