diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java index d193a9c..ce3da34 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java @@ -206,7 +206,7 @@ public class LoadTestTool extends AbstractHBaseTool { private String superUser; - private String userNames = "user1, user2, user3, user4"; + private String userNames; //This file is used to read authentication information in secure clusters. private String authnFileName; @@ -559,7 +559,7 @@ public class LoadTestTool extends AbstractHBaseTool { minColsPerKey, maxColsPerKey, COLUMN_FAMILY); } - if (User.isHBaseSecurityEnabled(conf) && userOwner != null) { + if (userOwner != null) { LOG.info("Granting permissions for user " + userOwner.getShortName()); AccessControlProtos.Permission.Action[] actions = { AccessControlProtos.Permission.Action.ADMIN, AccessControlProtos.Permission.Action.CREATE, @@ -576,20 +576,10 @@ public class LoadTestTool extends AbstractHBaseTool { // This will be comma separated list of expressions. String users[] = userNames.split(","); User user = null; - if (User.isHBaseSecurityEnabled(conf)) { - for (String userStr : users) { + for (String userStr : users) { + if (User.isHBaseSecurityEnabled(conf)) { user = User.create(loginAndReturnUGI(conf, userStr)); - LOG.info("Granting READ permission for the user " + user.getShortName()); - AccessControlProtos.Permission.Action[] actions = { AccessControlProtos.Permission.Action.READ }; - try { - AccessControlClient.grant(conf, tableName, user.getShortName(), null, null, actions); - } catch (Throwable e) { - LOG.fatal("Error in granting READ permission for the user " + user.getShortName(), e); - return EXIT_FAILURE; - } - } - } else { - for (String userStr : users) { + } else { user = User.createUserForTesting(conf, userStr, new String[0]); } } diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedReaderWithACL.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedReaderWithACL.java index a15c7e0..7470655 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedReaderWithACL.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedReaderWithACL.java @@ -95,7 +95,6 @@ public class MultiThreadedReaderWithACL extends MultiThreadedReader { public Object run() throws Exception { HTableInterface localTable = null; try { - get.setACLStrategy(true); Result result = null; int specialPermCellInsertionFactor = Integer.parseInt(dataGenerator.getArgs()[2]); int mod = ((int) keyToRead % userNames.length); @@ -108,7 +107,9 @@ public class MultiThreadedReaderWithACL extends MultiThreadedReader { result = localTable.get(get); } boolean isNullExpected = ((((int) keyToRead % specialPermCellInsertionFactor)) == 0); - LOG.info("Read happening from ACL " + isNullExpected); + if (isNullExpected) { + LOG.info("Read happening from ACL " + isNullExpected); + } long end = System.nanoTime(); verifyResultsAndUpdateMetrics(verify, get, end - start, result, localTable, isNullExpected); } catch (IOException e) {