You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2018/05/29 04:11:06 UTC
hbase git commit: HBASE-20652 Remove internal uses of some deprecated
MasterObserver hooks
Repository: hbase
Updated Branches:
refs/heads/master 81228f72d -> 05f57f4c0
HBASE-20652 Remove internal uses of some deprecated MasterObserver hooks
Remove internal uses of these hooks:
preModifyNamespace
postModifyNamespace
preModifyTable
postModifyTable
preModifyTableAction
postCompletedModifyTableAction
Signed-off-by: tedyu <yu...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/05f57f4c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/05f57f4c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/05f57f4c
Branch: refs/heads/master
Commit: 05f57f4c03c68e3184d6fcfaaa4353a0981125fa
Parents: 81228f7
Author: Apekshit Sharma <ap...@apache.org>
Authored: Thu May 10 20:34:14 2018 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Mon May 28 21:10:52 2018 -0700
----------------------------------------------------------------------
.../hbase/rsgroup/RSGroupAdminEndpoint.java | 4 ++--
.../hbase/coprocessor/MasterObserver.java | 1 -
.../hbase/security/access/AccessController.java | 22 +++++++++-----------
.../CoprocessorWhitelistMasterObserver.java | 5 +++--
.../visibility/VisibilityController.java | 4 ++--
.../hbase/coprocessor/TestMasterObserver.java | 16 ++++++++------
.../procedure/TestMasterObserverPostCalls.java | 6 ++++--
.../security/access/TestAccessController.java | 4 +++-
.../security/access/TestNamespaceCommands.java | 1 +
.../access/TestWithDisabledAuthorization.java | 5 ++++-
10 files changed, 39 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/05f57f4c/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java
----------------------------------------------------------------------
diff --git a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java
index 759f3e0..8546a40 100644
--- a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java
+++ b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java
@@ -490,8 +490,8 @@ public class RSGroupAdminEndpoint implements MasterCoprocessor, MasterObserver {
@Override
public void preModifyNamespace(ObserverContext<MasterCoprocessorEnvironment> ctx,
- NamespaceDescriptor ns) throws IOException {
- preCreateNamespace(ctx, ns);
+ NamespaceDescriptor currentNsDesc, NamespaceDescriptor newNsDesc) throws IOException {
+ preCreateNamespace(ctx, newNsDesc);
}
@Override
http://git-wip-us.apache.org/repos/asf/hbase/blob/05f57f4c/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
index a37f21a..f60a04d 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
@@ -229,7 +229,6 @@ public interface MasterObserver {
throws IOException {
preModifyTable(ctx, tableName, newDescriptor);
}
-
/**
* Called after the modifyTable operation has been requested. Called as part
* of modify table RPC call.
http://git-wip-us.apache.org/repos/asf/hbase/blob/05f57f4c/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 8182b42..7e824e2 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
@@ -969,24 +969,24 @@ public class AccessController implements MasterCoprocessor, RegionCoprocessor,
@Override
public void preModifyTable(ObserverContext<MasterCoprocessorEnvironment> c, TableName tableName,
- TableDescriptor htd) throws IOException {
+ TableDescriptor currentDesc, TableDescriptor newDesc) throws IOException {
// TODO: potentially check if this is a add/modify/delete column operation
requirePermission(c, "modifyTable",
tableName, null, null, Action.ADMIN, Action.CREATE);
}
@Override
- public void postModifyTable(ObserverContext<MasterCoprocessorEnvironment> c,
- TableName tableName, final TableDescriptor htd) throws IOException {
+ public void postModifyTable(ObserverContext<MasterCoprocessorEnvironment> c, TableName tableName,
+ TableDescriptor oldDesc, TableDescriptor currentDesc) throws IOException {
final Configuration conf = c.getEnvironment().getConfiguration();
// default the table owner to current user, if not specified.
- final String owner = (htd.getOwnerString() != null) ? htd.getOwnerString() :
+ final String owner = (currentDesc.getOwnerString() != null) ? currentDesc.getOwnerString() :
getActiveUser(c).getShortName();
User.runAsLoginUser(new PrivilegedExceptionAction<Void>() {
@Override
public Void run() throws Exception {
UserPermission userperm = new UserPermission(Bytes.toBytes(owner),
- htd.getTableName(), null, Action.values());
+ currentDesc.getTableName(), null, Action.values());
try (Table table = c.getEnvironment().getConnection().
getTable(AccessControlLists.ACL_TABLE_NAME)) {
AccessControlLists.addUserPermission(conf, userperm, table);
@@ -1233,18 +1233,16 @@ public class AccessController implements MasterCoprocessor, RegionCoprocessor,
@Override
public void preModifyNamespace(ObserverContext<MasterCoprocessorEnvironment> ctx,
- NamespaceDescriptor ns) throws IOException {
+ NamespaceDescriptor currentNsDesc, NamespaceDescriptor newNsDesc) throws IOException {
// We require only global permission so that
// a user with NS admin cannot altering namespace configurations. i.e. namespace quota
- requireGlobalPermission(ctx, "modifyNamespace",
- Action.ADMIN, ns.getName());
+ requireGlobalPermission(ctx, "modifyNamespace", Action.ADMIN, newNsDesc.getName());
}
@Override
- public void preGetNamespaceDescriptor(ObserverContext<MasterCoprocessorEnvironment> ctx, String namespace)
- throws IOException {
- requireNamespacePermission(ctx, "getNamespaceDescriptor",
- namespace, Action.ADMIN);
+ public void preGetNamespaceDescriptor(ObserverContext<MasterCoprocessorEnvironment> ctx,
+ String namespace) throws IOException {
+ requireNamespacePermission(ctx, "getNamespaceDescriptor", namespace, Action.ADMIN);
}
@Override
http://git-wip-us.apache.org/repos/asf/hbase/blob/05f57f4c/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/CoprocessorWhitelistMasterObserver.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/CoprocessorWhitelistMasterObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/CoprocessorWhitelistMasterObserver.java
index 44f736b..719fe33 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/CoprocessorWhitelistMasterObserver.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/CoprocessorWhitelistMasterObserver.java
@@ -55,8 +55,9 @@ public class CoprocessorWhitelistMasterObserver implements MasterCoprocessor, Ma
@Override
public void preModifyTable(ObserverContext<MasterCoprocessorEnvironment> ctx,
- TableName tableName, TableDescriptor htd) throws IOException {
- verifyCoprocessors(ctx, htd);
+ TableName tableName, TableDescriptor currentDesc, TableDescriptor newDesc)
+ throws IOException {
+ verifyCoprocessors(ctx, newDesc);
}
@Override
http://git-wip-us.apache.org/repos/asf/hbase/blob/05f57f4c/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java
index 6e00f40..4f00e7d 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java
@@ -226,8 +226,8 @@ public class VisibilityController implements MasterCoprocessor, RegionCoprocesso
}
@Override
- public void preModifyTable(ObserverContext<MasterCoprocessorEnvironment> ctx,
- TableName tableName, TableDescriptor htd) throws IOException {
+ public void preModifyTable(ObserverContext<MasterCoprocessorEnvironment> ctx, TableName tableName,
+ TableDescriptor currentDescriptor, TableDescriptor newDescriptor) throws IOException {
if (!authorizationEnabled) {
return;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/05f57f4c/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
index 579b6d3..a606e27 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
@@ -364,13 +364,15 @@ public class TestMasterObserver {
@Override
public void preModifyTable(ObserverContext<MasterCoprocessorEnvironment> env,
- TableName tableName, TableDescriptor htd) throws IOException {
+ TableName tableName, final TableDescriptor currentDescriptor,
+ final TableDescriptor newDescriptor) throws IOException {
preModifyTableCalled = true;
}
@Override
public void postModifyTable(ObserverContext<MasterCoprocessorEnvironment> env,
- TableName tableName, TableDescriptor htd) throws IOException {
+ TableName tableName, final TableDescriptor oldDescriptor,
+ final TableDescriptor currentDescriptor) throws IOException {
postModifyTableCalled = true;
}
@@ -424,13 +426,13 @@ public class TestMasterObserver {
@Override
public void preModifyNamespace(ObserverContext<MasterCoprocessorEnvironment> env,
- NamespaceDescriptor ns) throws IOException {
+ NamespaceDescriptor currentNsDesc, NamespaceDescriptor newNsDesc) throws IOException {
preModifyNamespaceCalled = true;
}
@Override
public void postModifyNamespace(ObserverContext<MasterCoprocessorEnvironment> env,
- NamespaceDescriptor ns) throws IOException {
+ NamespaceDescriptor oldNsDesc, NamespaceDescriptor currentNsDesc) throws IOException {
postModifyNamespaceCalled = true;
}
@@ -917,7 +919,8 @@ public class TestMasterObserver {
public void preModifyTableAction(
final ObserverContext<MasterCoprocessorEnvironment> env,
final TableName tableName,
- final TableDescriptor htd) throws IOException {
+ final TableDescriptor currentDescriptor,
+ final TableDescriptor newDescriptor) throws IOException {
preModifyTableActionCalled = true;
}
@@ -925,7 +928,8 @@ public class TestMasterObserver {
public void postCompletedModifyTableAction(
final ObserverContext<MasterCoprocessorEnvironment> env,
final TableName tableName,
- final TableDescriptor htd) throws IOException {
+ final TableDescriptor oldDescriptor,
+ final TableDescriptor currentDescriptor) throws IOException {
postCompletedModifyTableActionCalled = true;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/05f57f4c/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterObserverPostCalls.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterObserverPostCalls.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterObserverPostCalls.java
index e635710..089a2a4 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterObserverPostCalls.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterObserverPostCalls.java
@@ -106,7 +106,8 @@ public class TestMasterObserverPostCalls {
@Override
public void postModifyNamespace(
- ObserverContext<MasterCoprocessorEnvironment> ctx, NamespaceDescriptor desc) {
+ ObserverContext<MasterCoprocessorEnvironment> ctx, NamespaceDescriptor oldNsDesc,
+ NamespaceDescriptor currentNsDesc) {
postHookCalls.incrementAndGet();
}
@@ -125,7 +126,8 @@ public class TestMasterObserverPostCalls {
@Override
public void postModifyTable(
- ObserverContext<MasterCoprocessorEnvironment> ctx, TableName tn, TableDescriptor td) {
+ ObserverContext<MasterCoprocessorEnvironment> ctx, TableName tn,
+ TableDescriptor oldDescriptor, TableDescriptor currentDescriptor) {
postHookCalls.incrementAndGet();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/05f57f4c/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 2e9be30..870fa19 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
@@ -406,7 +406,9 @@ public class TestAccessController extends SecureTestUtil {
htd.addFamily(new HColumnDescriptor(TEST_FAMILY));
htd.addFamily(new HColumnDescriptor("fam_" + User.getCurrent().getShortName()));
ACCESS_CONTROLLER.preModifyTable(ObserverContextImpl.createAndPrepare(CP_ENV),
- TEST_TABLE, htd);
+ TEST_TABLE,
+ null, // not needed by AccessController
+ htd);
return null;
}
};
http://git-wip-us.apache.org/repos/asf/hbase/blob/05f57f4c/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 328024c..66e37bc 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
@@ -250,6 +250,7 @@ public class TestNamespaceCommands extends SecureTestUtil {
@Override
public Object run() throws Exception {
ACCESS_CONTROLLER.preModifyNamespace(ObserverContextImpl.createAndPrepare(CP_ENV),
+ null, // not needed by AccessController
NamespaceDescriptor.create(TEST_NAMESPACE).addConfiguration("abc", "156").build());
return null;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/05f57f4c/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestWithDisabledAuthorization.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestWithDisabledAuthorization.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestWithDisabledAuthorization.java
index 57d9e4b..110afcd 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestWithDisabledAuthorization.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestWithDisabledAuthorization.java
@@ -493,7 +493,9 @@ public class TestWithDisabledAuthorization extends SecureTestUtil {
htd.addFamily(new HColumnDescriptor(TEST_FAMILY));
htd.addFamily(new HColumnDescriptor(TEST_FAMILY2));
ACCESS_CONTROLLER.preModifyTable(ObserverContextImpl.createAndPrepare(CP_ENV),
- TEST_TABLE.getTableName(), htd);
+ TEST_TABLE.getTableName(),
+ null, // not needed by AccessController
+ htd);
return null;
}
}, SUPERUSER, USER_ADMIN, USER_RW, USER_RO, USER_OWNER, USER_CREATE, USER_QUAL, USER_NONE);
@@ -700,6 +702,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil {
public Object run() throws Exception {
NamespaceDescriptor ns = NamespaceDescriptor.create("test").build();
ACCESS_CONTROLLER.preModifyNamespace(ObserverContextImpl.createAndPrepare(CP_ENV),
+ null, // not needed by AccessController
ns);
return null;
}