HBASE-19691 Removes Global(A) requirement for getClusterStatus Signed-off-by: Chia-Ping Tsai <chia7...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/490728ae Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/490728ae Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/490728ae Branch: refs/heads/branch-1 Commit: 490728ae7f9e288bcc5570e1e5db2c1422bbbec6 Parents: fd33b35 Author: Josh Elser <els...@apache.org> Authored: Wed Jan 3 16:57:12 2018 -0500 Committer: Josh Elser <els...@apache.org> Committed: Wed Jan 3 19:15:49 2018 -0500 ---------------------------------------------------------------------- .../apache/hadoop/hbase/security/access/AccessController.java | 6 ------ .../hadoop/hbase/security/access/TestAccessController.java | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/490728ae/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java index e90fe05..b06b2bf 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java @@ -2741,10 +2741,4 @@ public class AccessController extends BaseMasterAndRegionObserver String groupName) throws IOException { requirePermission("balanceRSGroup", Action.ADMIN); } - - @Override - public void preGetClusterStatus(final ObserverContext<MasterCoprocessorEnvironment> ctx) - throws IOException { - requirePermission("getClusterStatus", Action.ADMIN); - } } http://git-wip-us.apache.org/repos/asf/hbase/blob/490728ae/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 5770a41..5071ca0 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 @@ -3051,7 +3051,7 @@ public class TestAccessController extends SecureTestUtil { } }; - verifyAllowed(action, SUPERUSER, USER_ADMIN); - verifyDenied(action, USER_CREATE, USER_RW, USER_RO, USER_NONE, USER_OWNER); + verifyAllowed( + action, SUPERUSER, USER_ADMIN, USER_CREATE, USER_RW, USER_RO, USER_NONE, USER_OWNER); } }
