From 36be60e502e9ae3b25a3841f8f2689a9dab7c9d9 Mon Sep 17 00:00:00 2001 From: Dima Spivak Date: Tue, 28 Oct 2014 23:40:22 +0000 Subject: [PATCH] HBASE-12312 Another couple of createTable race conditions Signed-off-by: stack Conflicts: hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestScanEarlyTermination.java --- .../java/org/apache/hadoop/hbase/replication/TestReplicationBase.java | 2 ++ .../org/apache/hadoop/hbase/security/access/TestAccessController.java | 4 ++++ .../apache/hadoop/hbase/security/access/TestScanEarlyTermination.java | 3 +-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java index 080d858..e1c1d16 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java @@ -137,7 +137,9 @@ public class TestReplicationBase { HBaseAdmin admin1 = new HBaseAdmin(conf1); HBaseAdmin admin2 = new HBaseAdmin(conf2); admin1.createTable(table, HBaseTestingUtility.KEYS_FOR_HBA_CREATE_TABLE); + utility1.waitUntilAllRegionsAssigned(TableName.valueOf(tableName)); admin2.createTable(table, HBaseTestingUtility.KEYS_FOR_HBA_CREATE_TABLE); + utility2.waitUntilAllRegionsAssigned(TableName.valueOf(tableName)); htable1 = new HTable(conf1, tableName); htable1.setWriteBufferSize(1024); htable2 = new HTable(conf2, tableName); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java index 714c340..69e747d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java @@ -1045,6 +1045,7 @@ public class TestAccessController extends SecureTestUtil { htd.addFamily(new HColumnDescriptor(family1)); htd.addFamily(new HColumnDescriptor(family2)); admin.createTable(htd); + TEST_UTIL.waitUntilAllRegionsAssigned(tableName); // create temp users User tblUser = User @@ -1319,6 +1320,7 @@ public class TestAccessController extends SecureTestUtil { htd.addFamily(new HColumnDescriptor(family1)); htd.addFamily(new HColumnDescriptor(family2)); admin.createTable(htd); + TEST_UTIL.waitUntilAllRegionsAssigned(tableName); // create temp users User user = User.createUserForTesting(TEST_UTIL.getConfiguration(), "user", new String[0]); @@ -1434,6 +1436,7 @@ public class TestAccessController extends SecureTestUtil { htd.addFamily(new HColumnDescriptor(family2)); htd.setOwner(USER_OWNER); admin.createTable(htd); + TEST_UTIL.waitUntilAllRegionsAssigned(tableName); List perms; @@ -1907,6 +1910,7 @@ public class TestAccessController extends SecureTestUtil { HTableDescriptor htd = new HTableDescriptor(TEST_TABLE2); htd.addFamily(new HColumnDescriptor(TEST_FAMILY)); admin.createTable(htd); + TEST_UTIL.waitUntilAllRegionsAssigned(TEST_TABLE2); // Starting a new RegionServer. JVMClusterUtil.RegionServerThread newRsThread = hbaseCluster diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestScanEarlyTermination.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestScanEarlyTermination.java index ab09910..ab1fb30 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestScanEarlyTermination.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestScanEarlyTermination.java @@ -126,8 +126,7 @@ public class TestScanEarlyTermination extends SecureTestUtil { htd.setConfiguration(AccessControlConstants.CF_ATTRIBUTE_EARLY_OUT, "true"); admin.createTable(htd); - - TEST_UTIL.waitTableEnabled(TEST_TABLE.getTableName().getName()); + TEST_UTIL.waitUntilAllRegionsAssigned(TEST_TABLE.getTableName()); } @After -- 1.7.12.4 (Apple Git-37)