You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by el...@apache.org on 2018/01/04 00:22:09 UTC
[2/4] hbase git commit: HBASE-19691 Removes Global(A) requirement for
getClusterStatus
HBASE-19691 Removes Global(A) requirement for getClusterStatus
Signed-off-by: Chia-Ping Tsai <ch...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f0011ebf
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f0011ebf
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f0011ebf
Branch: refs/heads/branch-2
Commit: f0011ebfe0415d31e345be2f12c1256124a5b27f
Parents: 97dc7d8
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 3 16:57:12 2018 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 3 19:02:26 2018 -0500
----------------------------------------------------------------------
.../apache/hadoop/hbase/security/access/AccessController.java | 6 ------
.../hadoop/hbase/security/access/TestAccessController.java | 4 ++--
src/main/asciidoc/_chapters/appendix_acl_matrix.adoc | 2 +-
3 files changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/f0011ebf/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 4e1924f..4110dfd 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
@@ -2751,12 +2751,6 @@ public class AccessController implements MasterCoprocessor, RegionCoprocessor,
checkLockPermissions(getActiveUser(ctx), null, tableName, null, description);
}
- @Override
- public void preGetClusterStatus(final ObserverContext<MasterCoprocessorEnvironment> ctx)
- throws IOException {
- requirePermission(getActiveUser(ctx), "getClusterStatus", Action.ADMIN);
- }
-
private void checkLockPermissions(User user, String namespace,
TableName tableName, RegionInfo[] regionInfos, String reason)
throws IOException {
http://git-wip-us.apache.org/repos/asf/hbase/blob/f0011ebf/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 f181747..83a6dfd 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
@@ -3134,7 +3134,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);
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/f0011ebf/src/main/asciidoc/_chapters/appendix_acl_matrix.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/_chapters/appendix_acl_matrix.adoc b/src/main/asciidoc/_chapters/appendix_acl_matrix.adoc
index 0c99b1f..83043f7 100644
--- a/src/main/asciidoc/_chapters/appendix_acl_matrix.adoc
+++ b/src/main/asciidoc/_chapters/appendix_acl_matrix.adoc
@@ -123,7 +123,7 @@ In case the table goes out of date, the unit tests which check for accuracy of p
| | getReplicationPeerConfig | superuser\|global(A)
| | updateReplicationPeerConfig | superuser\|global(A)
| | listReplicationPeers | superuser\|global(A)
-| | getClusterStatus | superuser\|global(A)
+| | getClusterStatus | any user
| Region | openRegion | superuser\|global(A)
| | closeRegion | superuser\|global(A)
| | flush | superuser\|global(A)\|global\(C)\|TableOwner\|table(A)\|table\(C)