You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ra...@apache.org on 2012/11/10 08:56:10 UTC
svn commit: r1407727 - in /hbase/branches/0.94/src:
main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
test/java/org/apache/hadoop/hbase/client/TestAdmin.java
Author: ramkrishna
Date: Sat Nov 10 07:56:09 2012
New Revision: 1407727
URL: http://svn.apache.org/viewvc?rev=1407727&view=rev
Log:
HBASE-6665 ROOT region should not be splitted even with META row as explicit split key (Rajesh)
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1407727&r1=1407726&r2=1407727&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Sat Nov 10 07:56:09 2012
@@ -5053,10 +5053,10 @@ public class HRegion implements HeapSize
* is based on the size of the store.
*/
public byte[] checkSplit() {
- // Can't split META
- if (getRegionInfo().isMetaRegion()) {
+ // Can't split ROOT/META
+ if (this.regionInfo.isMetaTable()) {
if (shouldForceSplit()) {
- LOG.warn("Cannot split meta regions in HBase 0.20 and above");
+ LOG.warn("Cannot split root/meta regions in HBase 0.20 and above");
}
return null;
}
Modified: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java?rev=1407727&r1=1407726&r2=1407727&view=diff
==============================================================================
--- hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java (original)
+++ hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java Sat Nov 10 07:56:09 2012
@@ -1573,7 +1573,19 @@ public class TestAdmin {
ct.stop();
}
}
-
+
+ @Test
+ public void testRootTableSplit() throws Exception {
+ Scan s = new Scan();
+ HTable rootTable = new HTable(TEST_UTIL.getConfiguration(), HConstants.ROOT_TABLE_NAME);
+ ResultScanner scanner = rootTable.getScanner(s);
+ Result metaEntry = scanner.next();
+ this.admin.split(HConstants.ROOT_TABLE_NAME, metaEntry.getRow());
+ Thread.sleep(1000);
+ List<HRegion> regions = TEST_UTIL.getMiniHBaseCluster().getRegions(HConstants.ROOT_TABLE_NAME);
+ assertEquals("ROOT region should not be splitted.",1, regions.size());
+ }
+
@org.junit.Rule
public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();