Repository: hbase Updated Branches: refs/heads/branch-1 5851ad023 -> 5202d3c25 refs/heads/branch-1.1 e959eb36f -> c1f0204e7 refs/heads/branch-1.2 142003e23 -> 6a80087f4 refs/heads/branch-1.3 a548d9426 -> fc47cc38b
http://git-wip-us.apache.org/repos/asf/hbase/blob/fc47cc38/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java index c74a42a..dab2c9d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java @@ -217,7 +217,7 @@ public class TestZKBasedOpenCloseRegion { Whitebox.setInternalState(regionServer, "tableDescriptors", htd); Mockito.doThrow(new IOException()).when(htd).get((TableName) Mockito.any()); try { - ProtobufUtil.openRegion(regionServer.getRSRpcServices(), + ProtobufUtil.openRegion(null, regionServer.getRSRpcServices(), regionServer.getServerName(), REGIONINFO); fail("It should throw IOException "); } catch (IOException e) { http://git-wip-us.apache.org/repos/asf/hbase/blob/fc47cc38/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/SecureTestUtil.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/SecureTestUtil.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/SecureTestUtil.java index cbc1a90..22a9748 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/SecureTestUtil.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/SecureTestUtil.java @@ -372,7 +372,7 @@ public class SecureTestUtil { BlockingRpcChannel service = acl.coprocessorService(HConstants.EMPTY_START_ROW); AccessControlService.BlockingInterface protocol = AccessControlService.newBlockingStub(service); - ProtobufUtil.grant(protocol, user, actions); + ProtobufUtil.grant(null, protocol, user, actions); } } return null; @@ -395,7 +395,7 @@ public class SecureTestUtil { BlockingRpcChannel service = acl.coprocessorService(HConstants.EMPTY_START_ROW); AccessControlService.BlockingInterface protocol = AccessControlService.newBlockingStub(service); - ProtobufUtil.revoke(protocol, user, actions); + ProtobufUtil.revoke(null, protocol, user, actions); } } return null; @@ -418,7 +418,7 @@ public class SecureTestUtil { BlockingRpcChannel service = acl.coprocessorService(HConstants.EMPTY_START_ROW); AccessControlService.BlockingInterface protocol = AccessControlService.newBlockingStub(service); - ProtobufUtil.grant(protocol, user, namespace, actions); + ProtobufUtil.grant(null, protocol, user, namespace, actions); } } return null; @@ -483,7 +483,7 @@ public class SecureTestUtil { BlockingRpcChannel service = acl.coprocessorService(HConstants.EMPTY_START_ROW); AccessControlService.BlockingInterface protocol = AccessControlService.newBlockingStub(service); - ProtobufUtil.revoke(protocol, user, namespace, actions); + ProtobufUtil.revoke(null, protocol, user, namespace, actions); } } return null; @@ -507,7 +507,7 @@ public class SecureTestUtil { BlockingRpcChannel service = acl.coprocessorService(HConstants.EMPTY_START_ROW); AccessControlService.BlockingInterface protocol = AccessControlService.newBlockingStub(service); - ProtobufUtil.grant(protocol, user, table, family, qualifier, actions); + ProtobufUtil.grant(null, protocol, user, table, family, qualifier, actions); } } return null; @@ -573,7 +573,7 @@ public class SecureTestUtil { BlockingRpcChannel service = acl.coprocessorService(HConstants.EMPTY_START_ROW); AccessControlService.BlockingInterface protocol = AccessControlService.newBlockingStub(service); - ProtobufUtil.revoke(protocol, user, table, family, qualifier, actions); + ProtobufUtil.revoke(null, protocol, user, table, family, qualifier, actions); } } return null; http://git-wip-us.apache.org/repos/asf/hbase/blob/fc47cc38/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java ---------------------------------------------------------------------- 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 242101f..173067a 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 @@ -1165,7 +1165,7 @@ public class TestAccessController extends SecureTestUtil { BlockingRpcChannel service = acl.coprocessorService(TEST_TABLE.getName()); AccessControlService.BlockingInterface protocol = AccessControlService.newBlockingStub(service); - ProtobufUtil.grant(protocol, USER_RO.getShortName(), TEST_TABLE, TEST_FAMILY, null, + ProtobufUtil.grant(null, protocol, USER_RO.getShortName(), TEST_TABLE, TEST_FAMILY, null, Action.READ); } return null; @@ -1180,7 +1180,7 @@ public class TestAccessController extends SecureTestUtil { BlockingRpcChannel service = acl.coprocessorService(TEST_TABLE.getName()); AccessControlService.BlockingInterface protocol = AccessControlService.newBlockingStub(service); - ProtobufUtil.revoke(protocol, USER_RO.getShortName(), TEST_TABLE, TEST_FAMILY, null, + ProtobufUtil.revoke(null, protocol, USER_RO.getShortName(), TEST_TABLE, TEST_FAMILY, null, Action.READ); } return null; @@ -1195,7 +1195,7 @@ public class TestAccessController extends SecureTestUtil { BlockingRpcChannel service = acl.coprocessorService(TEST_TABLE.getName()); AccessControlService.BlockingInterface protocol = AccessControlService.newBlockingStub(service); - ProtobufUtil.getUserPermissions(protocol, TEST_TABLE); + ProtobufUtil.getUserPermissions(null, protocol, TEST_TABLE); } return null; } @@ -1209,7 +1209,7 @@ public class TestAccessController extends SecureTestUtil { BlockingRpcChannel service = acl.coprocessorService(HConstants.EMPTY_START_ROW); AccessControlService.BlockingInterface protocol = AccessControlService.newBlockingStub(service); - ProtobufUtil.getUserPermissions(protocol); + ProtobufUtil.getUserPermissions(null, protocol); } return null; } @@ -1619,7 +1619,7 @@ public class TestAccessController extends SecureTestUtil { BlockingRpcChannel service = acl.coprocessorService(tableName.getName()); AccessControlService.BlockingInterface protocol = AccessControlService.newBlockingStub(service); - perms = ProtobufUtil.getUserPermissions(protocol, tableName); + perms = ProtobufUtil.getUserPermissions(null, protocol, tableName); } finally { acl.close(); } @@ -1646,7 +1646,7 @@ public class TestAccessController extends SecureTestUtil { BlockingRpcChannel service = acl.coprocessorService(tableName.getName()); AccessControlService.BlockingInterface protocol = AccessControlService.newBlockingStub(service); - perms = ProtobufUtil.getUserPermissions(protocol, tableName); + perms = ProtobufUtil.getUserPermissions(null, protocol, tableName); } finally { acl.close(); } @@ -1670,7 +1670,7 @@ public class TestAccessController extends SecureTestUtil { BlockingRpcChannel service = acl.coprocessorService(tableName.getName()); AccessControlService.BlockingInterface protocol = AccessControlService.newBlockingStub(service); - perms = ProtobufUtil.getUserPermissions(protocol, tableName); + perms = ProtobufUtil.getUserPermissions(null, protocol, tableName); } finally { acl.close(); } @@ -1690,7 +1690,7 @@ public class TestAccessController extends SecureTestUtil { BlockingRpcChannel service = acl.coprocessorService(tableName.getName()); AccessControlService.BlockingInterface protocol = AccessControlService.newBlockingStub(service); - perms = ProtobufUtil.getUserPermissions(protocol, tableName); + perms = ProtobufUtil.getUserPermissions(null, protocol, tableName); } finally { acl.close(); } @@ -1710,7 +1710,7 @@ public class TestAccessController extends SecureTestUtil { BlockingRpcChannel service = acl.coprocessorService(tableName.getName()); AccessControlService.BlockingInterface protocol = AccessControlService.newBlockingStub(service); - perms = ProtobufUtil.getUserPermissions(protocol, tableName); + perms = ProtobufUtil.getUserPermissions(null, protocol, tableName); } finally { acl.close(); } @@ -1733,7 +1733,7 @@ public class TestAccessController extends SecureTestUtil { BlockingRpcChannel service = acl.coprocessorService(HConstants.EMPTY_START_ROW); AccessControlService.BlockingInterface protocol = AccessControlService.newBlockingStub(service); - perms = ProtobufUtil.getUserPermissions(protocol); + perms = ProtobufUtil.getUserPermissions(null, protocol); } finally { acl.close(); } http://git-wip-us.apache.org/repos/asf/hbase/blob/fc47cc38/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java index 064daa2..377a3f6 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java @@ -231,6 +231,7 @@ public class TestNamespaceCommands extends SecureTestUtil { @Test public void testModifyNamespace() throws Exception { AccessTestAction modifyNamespace = new AccessTestAction() { + @Override public Object run() throws Exception { ACCESS_CONTROLLER.preModifyNamespace(ObserverContext.createAndPrepare(CP_ENV, null), NamespaceDescriptor.create(TEST_NAMESPACE).addConfiguration("abc", "156").build()); @@ -356,7 +357,7 @@ public class TestNamespaceCommands extends SecureTestUtil { acl.coprocessorService(HConstants.EMPTY_START_ROW); AccessControlService.BlockingInterface protocol = AccessControlService.newBlockingStub(service); - ProtobufUtil.grant(protocol, testUser, TEST_NAMESPACE, Action.WRITE); + ProtobufUtil.grant(null, protocol, testUser, TEST_NAMESPACE, Action.WRITE); } return null; } @@ -370,7 +371,7 @@ public class TestNamespaceCommands extends SecureTestUtil { BlockingRpcChannel service = acl.coprocessorService(HConstants.EMPTY_START_ROW); AccessControlService.BlockingInterface protocol = AccessControlService.newBlockingStub(service); - ProtobufUtil.grant(protocol, USER_GROUP_NS_ADMIN.getShortName(), + ProtobufUtil.grant(null, protocol, USER_GROUP_NS_ADMIN.getShortName(), TEST_NAMESPACE, Action.READ); } return null; @@ -378,6 +379,7 @@ public class TestNamespaceCommands extends SecureTestUtil { }; AccessTestAction revokeAction = new AccessTestAction() { + @Override public Object run() throws Exception { try(Connection conn = ConnectionFactory.createConnection(conf); Table acl = conn.getTable(AccessControlLists.ACL_TABLE_NAME)) { @@ -385,13 +387,14 @@ public class TestNamespaceCommands extends SecureTestUtil { acl.coprocessorService(HConstants.EMPTY_START_ROW); AccessControlService.BlockingInterface protocol = AccessControlService.newBlockingStub(service); - ProtobufUtil.revoke(protocol, testUser, TEST_NAMESPACE, Action.WRITE); + ProtobufUtil.revoke(null, protocol, testUser, TEST_NAMESPACE, Action.WRITE); } return null; } }; AccessTestAction revokeNamespaceAction = new AccessTestAction() { + @Override public Object run() throws Exception { Connection connection = ConnectionFactory.createConnection(conf); Table acl = connection.getTable(AccessControlLists.ACL_TABLE_NAME); @@ -400,7 +403,7 @@ public class TestNamespaceCommands extends SecureTestUtil { acl.coprocessorService(HConstants.EMPTY_START_ROW); AccessControlService.BlockingInterface protocol = AccessControlService.newBlockingStub(service); - ProtobufUtil.revoke(protocol, USER_GROUP_NS_ADMIN.getShortName(), + ProtobufUtil.revoke(null, protocol, USER_GROUP_NS_ADMIN.getShortName(), TEST_NAMESPACE, Action.READ); } finally { acl.close(); @@ -418,7 +421,7 @@ public class TestNamespaceCommands extends SecureTestUtil { BlockingRpcChannel service = acl.coprocessorService(HConstants.EMPTY_START_ROW); AccessControlService.BlockingInterface protocol = AccessControlService.newBlockingStub(service); - ProtobufUtil.getUserPermissions(protocol, Bytes.toBytes(TEST_NAMESPACE)); + ProtobufUtil.getUserPermissions(null, protocol, Bytes.toBytes(TEST_NAMESPACE)); } return null; }
