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

HBASE-8964 TestAccessController.testGlobalAuthorizationForNewRegisteredRS 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1503931 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2013-07-16 22:46:12 +00:00
parent a96d77ffd5
commit b73d17e4e4
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,7 +127,6 @@ public class TestAccessController {
// user with no permissions // user with no permissions
private static User USER_NONE; private static User USER_NONE;
private static byte[] TEST_TABLE2 = Bytes.toBytes("testtable2");
private static byte[] TEST_FAMILY = Bytes.toBytes("f1"); private static byte[] TEST_FAMILY = Bytes.toBytes("f1");
private static MasterCoprocessorEnvironment CP_ENV; private static MasterCoprocessorEnvironment CP_ENV;
@ -1918,7 +1917,7 @@ public class TestAccessController {
verifyDenied(cloneAction, USER_CREATE, USER_RW, USER_RO, USER_NONE, USER_OWNER); verifyDenied(cloneAction, USER_CREATE, USER_RW, USER_RO, USER_NONE, USER_OWNER);
} }
@Test @Test (timeout=30000)
public void testGlobalAuthorizationForNewRegisteredRS() throws Exception { public void testGlobalAuthorizationForNewRegisteredRS() throws Exception {
LOG.debug("Test for global authorization for a new registered RegionServer."); LOG.debug("Test for global authorization for a new registered RegionServer.");
MiniHBaseCluster hbaseCluster = TEST_UTIL.getHBaseCluster(); MiniHBaseCluster hbaseCluster = TEST_UTIL.getHBaseCluster();
@ -1941,7 +1940,8 @@ public class TestAccessController {
acl.close(); acl.close();
} }
HBaseAdmin admin = TEST_UTIL.getHBaseAdmin(); HBaseAdmin admin = TEST_UTIL.getHBaseAdmin();
HTableDescriptor htd = new HTableDescriptor(TEST_TABLE2); final byte [] tableName = Bytes.toBytes("testGlobalAuthorizationForNewRegisteredRS");
HTableDescriptor htd = new HTableDescriptor(tableName);
htd.addFamily(new HColumnDescriptor(TEST_FAMILY)); htd.addFamily(new HColumnDescriptor(TEST_FAMILY));
admin.createTable(htd); admin.createTable(htd);
@ -1951,7 +1951,7 @@ public class TestAccessController {
final HRegionServer newRs = newRsThread.getRegionServer(); final HRegionServer newRs = newRsThread.getRegionServer();
// Move region to the new RegionServer. // Move region to the new RegionServer.
HTable table = new HTable(TEST_UTIL.getConfiguration(), TEST_TABLE2); HTable table = new HTable(TEST_UTIL.getConfiguration(), tableName);
try { try {
NavigableMap<HRegionInfo, ServerName> regions = table NavigableMap<HRegionInfo, ServerName> regions = table
.getRegionLocations(); .getRegionLocations();
@ -1968,25 +1968,25 @@ public class TestAccessController {
}; };
SUPERUSER.runAs(moveAction); SUPERUSER.runAs(moveAction);
final int RETRIES_LIMIT = 10; final int RETRIES_LIMIT = 100;
int retries = 0; int retries = 0;
while (newRs.getOnlineRegions(TEST_TABLE2).size() < 1 && retries < RETRIES_LIMIT) { while (newRs.getOnlineRegions(tableName).size() < 1 && retries < RETRIES_LIMIT) {
LOG.debug("Waiting for region to be opened. Already retried " + retries LOG.debug("Waiting for a region to be opened. Already retried " + retries + " times.");
+ " times.");
try { try {
Thread.sleep(200); Thread.sleep(1000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
} }
retries++; retries++;
if (retries == RETRIES_LIMIT - 1) { if (retries == RETRIES_LIMIT - 1) {
fail("Retry exhaust for waiting region to be opened."); fail("Retry exhaust for waiting region to be opened: " +
newRs.getOnlineRegions(tableName));
} }
} }
// Verify write permission for user "admin2" who has the global // Verify write permission for user "admin2" who has the global
// permissions. // permissions.
PrivilegedExceptionAction putAction = new PrivilegedExceptionAction() { PrivilegedExceptionAction putAction = new PrivilegedExceptionAction() {
public Object run() throws Exception { public Object run() throws Exception {
HTable table = new HTable(TEST_UTIL.getConfiguration(), TEST_TABLE2); HTable table = new HTable(TEST_UTIL.getConfiguration(), tableName);
Put put = new Put(Bytes.toBytes("test")); Put put = new Put(Bytes.toBytes("test"));
put.add(TEST_FAMILY, Bytes.toBytes("qual"), Bytes.toBytes("value")); put.add(TEST_FAMILY, Bytes.toBytes("qual"), Bytes.toBytes("value"));
table.put(put); table.put(put);