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

HBASE-19150 TestSnapshotWithAcl is flaky 

Signed-off-by: Andrew Purtell <apurtell@apache.org>
This commit is contained in:
churro 2017-11-01 12:14:12 -07:00 committed by Andrew Purtell
parent b0ff1dd5cb
commit 61753bd133
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotWithAcl.java
View File

@ -28,6 +28,7 @@ import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
import org.apache.hadoop.hbase.master.MasterCoprocessorHost; import org.apache.hadoop.hbase.master.MasterCoprocessorHost;
import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.security.User;
import org.apache.hadoop.hbase.security.access.AccessControlConstants; import org.apache.hadoop.hbase.security.access.AccessControlConstants;
import org.apache.hadoop.hbase.security.access.AccessControlLists;
import org.apache.hadoop.hbase.security.access.AccessController; import org.apache.hadoop.hbase.security.access.AccessController;
import org.apache.hadoop.hbase.security.access.Permission; import org.apache.hadoop.hbase.security.access.Permission;
import org.apache.hadoop.hbase.security.access.SecureTestUtil; import org.apache.hadoop.hbase.security.access.SecureTestUtil;
@ -41,11 +42,12 @@ import org.junit.Test;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
import java.io.IOException; import java.io.IOException;
import java.util.UUID;
@Category(MediumTests.class) @Category(MediumTests.class)
public class TestSnapshotWithAcl extends SecureTestUtil { public class TestSnapshotWithAcl extends SecureTestUtil {
public TableName TEST_TABLE = TableName.valueOf("TestSnapshotWithAcl"); public TableName TEST_TABLE = TableName.valueOf(UUID.randomUUID().toString());
private static final int ROW_COUNT = 30000; private static final int ROW_COUNT = 30000;
@ -119,6 +121,7 @@ public class TestSnapshotWithAcl extends SecureTestUtil {
// Enable EXEC permission checking // Enable EXEC permission checking
conf.setBoolean(AccessControlConstants.EXEC_PERMISSION_CHECKS_KEY, true); conf.setBoolean(AccessControlConstants.EXEC_PERMISSION_CHECKS_KEY, true);
TEST_UTIL.startMiniCluster(); TEST_UTIL.startMiniCluster();
TEST_UTIL.waitUntilAllRegionsAssigned(AccessControlLists.ACL_TABLE_NAME);
MasterCoprocessorHost cpHost = MasterCoprocessorHost cpHost =
TEST_UTIL.getMiniHBaseCluster().getMaster().getMasterCoprocessorHost(); TEST_UTIL.getMiniHBaseCluster().getMaster().getMasterCoprocessorHost();
cpHost.load(AccessController.class, Coprocessor.PRIORITY_HIGHEST, conf); cpHost.load(AccessController.class, Coprocessor.PRIORITY_HIGHEST, conf);
@ -193,11 +196,11 @@ public class TestSnapshotWithAcl extends SecureTestUtil {
loadData(); loadData();
verifyRows(TEST_TABLE); verifyRows(TEST_TABLE);
String snapshotName1 = "testSnapshot1"; String snapshotName1 = UUID.randomUUID().toString();
admin.snapshot(snapshotName1, TEST_TABLE); admin.snapshot(snapshotName1, TEST_TABLE);
// clone snapshot with restoreAcl true. // clone snapshot with restoreAcl true.
TableName tableName1 = TableName.valueOf("tableName1"); TableName tableName1 = TableName.valueOf(UUID.randomUUID().toString());
admin.cloneSnapshot(snapshotName1, tableName1, true); admin.cloneSnapshot(snapshotName1, tableName1, true);
verifyRows(tableName1); verifyRows(tableName1);
verifyAllowed(new AccessReadAction(tableName1), USER_OWNER, USER_RO, USER_RW); verifyAllowed(new AccessReadAction(tableName1), USER_OWNER, USER_RO, USER_RW);
@ -206,7 +209,7 @@ public class TestSnapshotWithAcl extends SecureTestUtil {
verifyDenied(new AccessWriteAction(tableName1), USER_RO, USER_NONE); verifyDenied(new AccessWriteAction(tableName1), USER_RO, USER_NONE);
// clone snapshot with restoreAcl false. // clone snapshot with restoreAcl false.
TableName tableName2 = TableName.valueOf("tableName2"); TableName tableName2 = TableName.valueOf(UUID.randomUUID().toString());
admin.cloneSnapshot(snapshotName1, tableName2, false); admin.cloneSnapshot(snapshotName1, tableName2, false);
verifyRows(tableName2); verifyRows(tableName2);
verifyAllowed(new AccessReadAction(tableName2), USER_OWNER); verifyAllowed(new AccessReadAction(tableName2), USER_OWNER);