Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-13285 Fix flaky getRegions() in TestAccessController.setUp()

This commit is contained in:
Matteo Bertozzi 2015-03-19 17:54:46 +00:00
parent 27cf749af8
commit 6a95dd3551
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
View File

@ -232,7 +232,7 @@ public class TestAccessController extends SecureTestUtil {
htd.addFamily(hcd); htd.addFamily(hcd);
htd.setOwner(USER_OWNER); htd.setOwner(USER_OWNER);
admin.createTable(htd, new byte[][] { Bytes.toBytes("s") }); admin.createTable(htd, new byte[][] { Bytes.toBytes("s") });
TEST_UTIL.waitTableEnabled(TEST_TABLE.getTableName()); TEST_UTIL.waitUntilAllRegionsAssigned(TEST_TABLE.getTableName());
HRegion region = TEST_UTIL.getHBaseCluster().getRegions(TEST_TABLE.getTableName()).get(0); HRegion region = TEST_UTIL.getHBaseCluster().getRegions(TEST_TABLE.getTableName()).get(0);
RegionCoprocessorHost rcpHost = region.getCoprocessorHost(); RegionCoprocessorHost rcpHost = region.getCoprocessorHost();
@ -930,7 +930,7 @@ public class TestAccessController extends SecureTestUtil {
setPermission(loadPath, FsPermission.valueOf("-rwxrwxrwx")); setPermission(loadPath, FsPermission.valueOf("-rwxrwxrwx"));
try (HTable table = (HTable)TEST_UTIL.getConnection().getTable(tableName)) { try (HTable table = (HTable)TEST_UTIL.getConnection().getTable(tableName)) {
TEST_UTIL.waitTableEnabled(tableName); TEST_UTIL.waitUntilAllRegionsAssigned(tableName);
LoadIncrementalHFiles loader = new LoadIncrementalHFiles(conf); LoadIncrementalHFiles loader = new LoadIncrementalHFiles(conf);
loader.doBulkLoad(loadPath, table); loader.doBulkLoad(loadPath, table);
} }
@ -2173,13 +2173,13 @@ public class TestAccessController extends SecureTestUtil {
String namespace = "testNamespaceUserGrant"; String namespace = "testNamespaceUserGrant";
NamespaceDescriptor desc = NamespaceDescriptor.create(namespace).build(); NamespaceDescriptor desc = NamespaceDescriptor.create(namespace).build();
TEST_UTIL.getMiniHBaseCluster().getMaster().createNamespace(desc); TEST_UTIL.getMiniHBaseCluster().getMaster().createNamespace(desc);
// Grant namespace READ to USER_NONE, this should supersede any table permissions // Grant namespace READ to USER_NONE, this should supersede any table permissions
grantOnNamespace(TEST_UTIL, USER_NONE.getShortName(), namespace, Permission.Action.READ); grantOnNamespace(TEST_UTIL, USER_NONE.getShortName(), namespace, Permission.Action.READ);
// Now USER_NONE should be able to read also // Now USER_NONE should be able to read also
verifyAllowed(getAction, USER_NONE); verifyAllowed(getAction, USER_NONE);
TEST_UTIL.getMiniHBaseCluster().getMaster().deleteNamespace(namespace); TEST_UTIL.getMiniHBaseCluster().getMaster().deleteNamespace(namespace);
} }
@ -2392,7 +2392,7 @@ public class TestAccessController extends SecureTestUtil {
// Verify that EXEC permission is checked correctly // Verify that EXEC permission is checked correctly
verifyDenied(execEndpointAction, userB); verifyDenied(execEndpointAction, userB);
verifyAllowed(execEndpointAction, userA); verifyAllowed(execEndpointAction, userA);
String namespace = "testCoprocessorExec"; String namespace = "testCoprocessorExec";
NamespaceDescriptor desc = NamespaceDescriptor.create(namespace).build(); NamespaceDescriptor desc = NamespaceDescriptor.create(namespace).build();
TEST_UTIL.getMiniHBaseCluster().getMaster().createNamespace(desc); TEST_UTIL.getMiniHBaseCluster().getMaster().createNamespace(desc);
@ -2402,7 +2402,7 @@ public class TestAccessController extends SecureTestUtil {
// User B should now be allowed also // User B should now be allowed also
verifyAllowed(execEndpointAction, userA, userB); verifyAllowed(execEndpointAction, userA, userB);
TEST_UTIL.getMiniHBaseCluster().getMaster().deleteNamespace(namespace); TEST_UTIL.getMiniHBaseCluster().getMaster().deleteNamespace(namespace);
} }