http://git-wip-us.apache.org/repos/asf/hbase/blob/353627b3/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestTablePermissions.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestTablePermissions.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestTablePermissions.java index 4d2cb0b..4a16808 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestTablePermissions.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestTablePermissions.java @@ -316,7 +316,16 @@ public class TestTablePermissions { table.put(new Put(Bytes.toBytes("row2")) .addColumn(TEST_FAMILY, TEST_QUALIFIER, Bytes.toBytes("v2"))); Admin admin = UTIL.getAdmin(); - admin.split(TEST_TABLE); + try { + admin.split(TEST_TABLE); + } + catch (IOException e) { + //although split fail, this may not affect following check + //In old Split API without AM2, if region's best split key is not found, + //there are not exception thrown. But in current API, exception + //will be thrown. + LOG.debug("region is not splittable, because " + e); + } // wait for split Thread.sleep(10000);
http://git-wip-us.apache.org/repos/asf/hbase/blob/353627b3/hbase-shell/src/test/ruby/hbase/admin_test.rb ---------------------------------------------------------------------- diff --git a/hbase-shell/src/test/ruby/hbase/admin_test.rb b/hbase-shell/src/test/ruby/hbase/admin_test.rb index 60fc43b..2a20d34 100644 --- a/hbase-shell/src/test/ruby/hbase/admin_test.rb +++ b/hbase-shell/src/test/ruby/hbase/admin_test.rb @@ -124,7 +124,11 @@ module Hbase #------------------------------------------------------------------------------- define_test "split should work" do - command(:split, 'hbase:meta', nil) + begin + command(:split, 'hbase:meta', nil) + rescue org.apache.hadoop.hbase.ipc.RemoteWithExtrasException => e + puts "can not split hbase:meta" + end end #-------------------------------------------------------------------------------