From 1c1c6b3876f1558f07eb8722b5339b4b4f7efce5 Mon Sep 17 00:00:00 2001 From: Apekshit Sharma Date: Tue, 3 Oct 2017 18:34:16 -0700 Subject: [PATCH] HBASE-18931 Make ObserverContext an interface. Change-Id: I9284a3271e06a3ee8ab9719cf012a4d8b3a82c88 --- .../hadoop/hbase/coprocessor/CoprocessorHost.java | 2 +- .../hadoop/hbase/coprocessor/ObserverContext.java | 80 ++----------- .../hbase/coprocessor/ObserverContextImpl.java | 101 +++++++++++++++++ .../security/access/TestAccessController.java | 126 ++++++++++----------- .../security/access/TestAccessController3.java | 4 +- .../security/access/TestNamespaceCommands.java | 12 +- .../access/TestWithDisabledAuthorization.java | 92 +++++++-------- 7 files changed, 227 insertions(+), 190 deletions(-) create mode 100644 hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/ObserverContextImpl.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java index 07e5a3a0cc..14a1d31fe6 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java @@ -545,7 +545,7 @@ public abstract class CoprocessorHost extends Function> {} - private abstract class ObserverOperation extends ObserverContext { + private abstract class ObserverOperation extends ObserverContextImpl { ObserverGetter observerGetter; ObserverOperation(ObserverGetter observerGetter) { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/ObserverContext.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/ObserverContext.java index f13ef304ce..3cb054b44d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/ObserverContext.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/ObserverContext.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -17,16 +17,14 @@ */ package org.apache.hadoop.hbase.coprocessor; -import java.util.Optional; - -import com.google.common.annotations.VisibleForTesting; import org.apache.hadoop.hbase.CoprocessorEnvironment; import org.apache.hadoop.hbase.HBaseInterfaceAudience; -import org.apache.hadoop.hbase.ipc.RpcServer; import org.apache.hadoop.hbase.security.User; import org.apache.yetus.audience.InterfaceAudience; import org.apache.yetus.audience.InterfaceStability; +import java.util.Optional; + /** * Carries the execution state for a given invocation of an Observer coprocessor * ({@link RegionObserver}, {@link MasterObserver}, or {@link WALObserver}) @@ -39,64 +37,21 @@ import org.apache.yetus.audience.InterfaceStability; */ @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC) @InterfaceStability.Evolving -public class ObserverContext { - private E env; - private boolean bypass; - private boolean complete; - private final User caller; - - @InterfaceAudience.Private - public ObserverContext(User caller) { - this.caller = caller; - } - - public E getEnvironment() { - return env; - } - - @InterfaceAudience.Private - public void prepare(E env) { - this.env = env; - } +public interface ObserverContext { + E getEnvironment(); /** * Call to indicate that the current coprocessor's return value should be * used in place of the normal HBase obtained value. */ - public void bypass() { - bypass = true; - } + void bypass(); /** * Call to indicate that additional coprocessors further down the execution * chain do not need to be invoked. Implies that this coprocessor's response * is definitive. */ - public void complete() { - complete = true; - } - - /** - * For use by the coprocessor framework. - * @return true if {@link ObserverContext#bypass()} - * was called by one of the loaded coprocessors, false otherwise. - */ - public boolean shouldBypass() { - boolean current = bypass; - bypass = false; - return current; - } - - /** - * For use by the coprocessor framework. - * @return true if {@link ObserverContext#complete()} - * was called by one of the loaded coprocessors, false otherwise. - */ - public boolean shouldComplete() { - boolean current = complete; - complete = false; - return current; - } + void complete(); /** * Returns the active user for the coprocessor call. If an explicit {@code User} instance was @@ -104,25 +59,6 @@ public class ObserverContext { * RPC call, the remote user is used. May not be present if the execution is outside of an RPC * context. */ - public Optional getCaller() { - return Optional.ofNullable(caller); - } + Optional getCaller(); - /** - * Instantiates a new ObserverContext instance if the passed reference is null and - * sets the environment in the new or existing instance. This allows deferring the instantiation - * of a ObserverContext until it is actually needed. - * @param The environment type for the context - * @param env The coprocessor environment to set - * @return An instance of ObserverContext with the environment set - */ - @Deprecated - @InterfaceAudience.Private - @VisibleForTesting - // TODO: Remove this method, ObserverContext should not depend on RpcServer - public static ObserverContext createAndPrepare(E env) { - ObserverContext ctx = new ObserverContext<>(RpcServer.getRequestUser().orElse(null)); - ctx.prepare(env); - return ctx; - } } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/ObserverContextImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/ObserverContextImpl.java new file mode 100644 index 0000000000..faa1d56843 --- /dev/null +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/ObserverContextImpl.java @@ -0,0 +1,101 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hbase.coprocessor; + +import java.util.Optional; + +import com.google.common.annotations.VisibleForTesting; +import org.apache.hadoop.hbase.CoprocessorEnvironment; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; +import org.apache.hadoop.hbase.ipc.RpcServer; +import org.apache.hadoop.hbase.security.User; +import org.apache.yetus.audience.InterfaceAudience; +import org.apache.yetus.audience.InterfaceStability; + +/** + * This is the only implementation of {@link ObserverContext}, which serves as the interface for + * third-party Coprocessor developers. + */ +@InterfaceAudience.Private +public class ObserverContextImpl implements ObserverContext { + private E env; + private boolean bypass; + private boolean complete; + private final User caller; + + public ObserverContextImpl(User caller) { + this.caller = caller; + } + + public E getEnvironment() { + return env; + } + + public void prepare(E env) { + this.env = env; + } + + public void bypass() { + bypass = true; + } + + public void complete() { + complete = true; + } + + /** + * @return {@code true}, if {@link ObserverContext#bypass()} was called by one of the loaded + * coprocessors, {@code false} otherwise. + */ + public boolean shouldBypass() { + boolean current = bypass; + bypass = false; + return current; + } + + /** + * @return {@code true}, if {@link ObserverContext#complete()} was called by one of the loaded + * coprocessors, {@code false} otherwise. + */ + public boolean shouldComplete() { + boolean current = complete; + complete = false; + return current; + } + + public Optional getCaller() { + return Optional.ofNullable(caller); + } + + /** + * Instantiates a new ObserverContext instance if the passed reference is null and + * sets the environment in the new or existing instance. This allows deferring the instantiation + * of a ObserverContext until it is actually needed. + * @param The environment type for the context + * @param env The coprocessor environment to set + * @return An instance of ObserverContext with the environment set + */ + @Deprecated + @VisibleForTesting + // TODO: Remove this method, ObserverContext should not depend on RpcServer + public static ObserverContext createAndPrepare(E env) { + ObserverContextImpl ctx = new ObserverContextImpl<>(RpcServer.getRequestUser().orElse(null)); + ctx.prepare(env); + return ctx; + } +} 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 4b5d937e2b..c1624e033f 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 @@ -78,7 +78,7 @@ import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.client.security.SecurityCapability; import org.apache.hadoop.hbase.coprocessor.CoprocessorHost; import org.apache.hadoop.hbase.coprocessor.MasterCoprocessorEnvironment; -import org.apache.hadoop.hbase.coprocessor.ObserverContext; +import org.apache.hadoop.hbase.coprocessor.ObserverContextImpl; import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor; import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; import org.apache.hadoop.hbase.coprocessor.RegionServerCoprocessorEnvironment; @@ -381,7 +381,7 @@ public class TestAccessController extends SecureTestUtil { public Object run() throws Exception { HTableDescriptor htd = new HTableDescriptor(TableName.valueOf(name.getMethodName())); htd.addFamily(new HColumnDescriptor(TEST_FAMILY)); - ACCESS_CONTROLLER.preCreateTable(ObserverContext.createAndPrepare(CP_ENV), htd, null); + ACCESS_CONTROLLER.preCreateTable(ObserverContextImpl.createAndPrepare(CP_ENV), htd, null); return null; } }; @@ -402,7 +402,7 @@ public class TestAccessController extends SecureTestUtil { HTableDescriptor htd = new HTableDescriptor(TEST_TABLE); htd.addFamily(new HColumnDescriptor(TEST_FAMILY)); htd.addFamily(new HColumnDescriptor("fam_" + User.getCurrent().getShortName())); - ACCESS_CONTROLLER.preModifyTable(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preModifyTable(ObserverContextImpl.createAndPrepare(CP_ENV), TEST_TABLE, htd); return null; } @@ -419,7 +419,7 @@ public class TestAccessController extends SecureTestUtil { @Override public Object run() throws Exception { ACCESS_CONTROLLER - .preDeleteTable(ObserverContext.createAndPrepare(CP_ENV), TEST_TABLE); + .preDeleteTable(ObserverContextImpl.createAndPrepare(CP_ENV), TEST_TABLE); return null; } }; @@ -435,7 +435,7 @@ public class TestAccessController extends SecureTestUtil { @Override public Object run() throws Exception { ACCESS_CONTROLLER - .preTruncateTable(ObserverContext.createAndPrepare(CP_ENV), + .preTruncateTable(ObserverContextImpl.createAndPrepare(CP_ENV), TEST_TABLE); return null; } @@ -452,7 +452,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preAddColumnFamily(ObserverContext.createAndPrepare(CP_ENV), TEST_TABLE, + ACCESS_CONTROLLER.preAddColumnFamily(ObserverContextImpl.createAndPrepare(CP_ENV), TEST_TABLE, hcd); return null; } @@ -470,7 +470,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preModifyColumnFamily(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preModifyColumnFamily(ObserverContextImpl.createAndPrepare(CP_ENV), TEST_TABLE, hcd); return null; } @@ -486,7 +486,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preDeleteColumnFamily(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preDeleteColumnFamily(ObserverContextImpl.createAndPrepare(CP_ENV), TEST_TABLE, TEST_FAMILY); return null; } @@ -502,7 +502,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction disableTable = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preDisableTable(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preDisableTable(ObserverContextImpl.createAndPrepare(CP_ENV), TEST_TABLE); return null; } @@ -511,7 +511,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction disableAclTable = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preDisableTable(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preDisableTable(ObserverContextImpl.createAndPrepare(CP_ENV), AccessControlLists.ACL_TABLE_NAME); return null; } @@ -532,7 +532,7 @@ public class TestAccessController extends SecureTestUtil { @Override public Object run() throws Exception { ACCESS_CONTROLLER - .preEnableTable(ObserverContext.createAndPrepare(CP_ENV), TEST_TABLE); + .preEnableTable(ObserverContextImpl.createAndPrepare(CP_ENV), TEST_TABLE); return null; } }; @@ -614,7 +614,7 @@ public class TestAccessController extends SecureTestUtil { @Override public Object run() throws Exception { ACCESS_CONTROLLER - .preAbortProcedure(ObserverContext.createAndPrepare(CP_ENV), procExec, procId); + .preAbortProcedure(ObserverContextImpl.createAndPrepare(CP_ENV), procExec, procId); return null; } }; @@ -639,7 +639,7 @@ public class TestAccessController extends SecureTestUtil { @Override public Object run() throws Exception { ACCESS_CONTROLLER - .postGetProcedures(ObserverContext.createAndPrepare(CP_ENV), procList); + .postGetProcedures(ObserverContextImpl.createAndPrepare(CP_ENV), procList); return null; } }; @@ -655,7 +655,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preGetLocks(ObserverContext.createAndPrepare(CP_ENV)); + ACCESS_CONTROLLER.preGetLocks(ObserverContextImpl.createAndPrepare(CP_ENV)); return null; } }; @@ -677,7 +677,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preMove(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preMove(ObserverContextImpl.createAndPrepare(CP_ENV), hri, server, server); return null; } @@ -699,7 +699,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preAssign(ObserverContext.createAndPrepare(CP_ENV), hri); + ACCESS_CONTROLLER.preAssign(ObserverContextImpl.createAndPrepare(CP_ENV), hri); return null; } }; @@ -720,7 +720,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preUnassign(ObserverContext.createAndPrepare(CP_ENV), hri, false); + ACCESS_CONTROLLER.preUnassign(ObserverContextImpl.createAndPrepare(CP_ENV), hri, false); return null; } }; @@ -741,7 +741,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preRegionOffline(ObserverContext.createAndPrepare(CP_ENV), hri); + ACCESS_CONTROLLER.preRegionOffline(ObserverContextImpl.createAndPrepare(CP_ENV), hri); return null; } }; @@ -756,7 +756,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preSetSplitOrMergeEnabled(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preSetSplitOrMergeEnabled(ObserverContextImpl.createAndPrepare(CP_ENV), true, MasterSwitchType.MERGE); return null; } @@ -772,7 +772,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preBalance(ObserverContext.createAndPrepare(CP_ENV)); + ACCESS_CONTROLLER.preBalance(ObserverContextImpl.createAndPrepare(CP_ENV)); return null; } }; @@ -787,7 +787,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preBalanceSwitch(ObserverContext.createAndPrepare(CP_ENV), true); + ACCESS_CONTROLLER.preBalanceSwitch(ObserverContextImpl.createAndPrepare(CP_ENV), true); return null; } }; @@ -802,7 +802,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preShutdown(ObserverContext.createAndPrepare(CP_ENV)); + ACCESS_CONTROLLER.preShutdown(ObserverContextImpl.createAndPrepare(CP_ENV)); return null; } }; @@ -817,7 +817,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preStopMaster(ObserverContext.createAndPrepare(CP_ENV)); + ACCESS_CONTROLLER.preStopMaster(ObserverContextImpl.createAndPrepare(CP_ENV)); return null; } }; @@ -841,7 +841,7 @@ public class TestAccessController extends SecureTestUtil { @Override public Object run() throws Exception { ACCESS_CONTROLLER.preSplitRegion( - ObserverContext.createAndPrepare(CP_ENV), + ObserverContextImpl.createAndPrepare(CP_ENV), tableName, TEST_ROW); return null; @@ -858,7 +858,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preFlush(ObserverContext.createAndPrepare(RCP_ENV)); + ACCESS_CONTROLLER.preFlush(ObserverContextImpl.createAndPrepare(RCP_ENV)); return null; } }; @@ -873,7 +873,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preCompact(ObserverContext.createAndPrepare(RCP_ENV), null, null, + ACCESS_CONTROLLER.preCompact(ObserverContextImpl.createAndPrepare(RCP_ENV), null, null, ScanType.COMPACT_RETAIN_DELETES, null); return null; } @@ -1939,7 +1939,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preStopRegionServer(ObserverContext.createAndPrepare(RSCP_ENV)); + ACCESS_CONTROLLER.preStopRegionServer(ObserverContextImpl.createAndPrepare(RSCP_ENV)); return null; } }; @@ -1954,7 +1954,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preRollWALWriterRequest(ObserverContext.createAndPrepare(RSCP_ENV)); + ACCESS_CONTROLLER.preRollWALWriterRequest(ObserverContextImpl.createAndPrepare(RSCP_ENV)); return null; } }; @@ -1969,7 +1969,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preOpen(ObserverContext.createAndPrepare(RCP_ENV)); + ACCESS_CONTROLLER.preOpen(ObserverContextImpl.createAndPrepare(RCP_ENV)); return null; } }; @@ -1984,7 +1984,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preClose(ObserverContext.createAndPrepare(RCP_ENV), false); + ACCESS_CONTROLLER.preClose(ObserverContextImpl.createAndPrepare(RCP_ENV), false); return null; } }; @@ -2003,7 +2003,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction snapshotAction = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preSnapshot(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preSnapshot(ObserverContextImpl.createAndPrepare(CP_ENV), snapshot, htd); return null; } @@ -2012,7 +2012,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction deleteAction = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preDeleteSnapshot(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preDeleteSnapshot(ObserverContextImpl.createAndPrepare(CP_ENV), snapshot); return null; } @@ -2021,7 +2021,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction restoreAction = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preRestoreSnapshot(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preRestoreSnapshot(ObserverContextImpl.createAndPrepare(CP_ENV), snapshot, htd); return null; } @@ -2030,7 +2030,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction cloneAction = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preCloneSnapshot(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preCloneSnapshot(ObserverContextImpl.createAndPrepare(CP_ENV), snapshot, null); return null; } @@ -2063,7 +2063,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction snapshotAction = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preSnapshot(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preSnapshot(ObserverContextImpl.createAndPrepare(CP_ENV), snapshot, htd); return null; } @@ -2075,7 +2075,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction deleteAction = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preDeleteSnapshot(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preDeleteSnapshot(ObserverContextImpl.createAndPrepare(CP_ENV), snapshot); return null; } @@ -2087,7 +2087,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction restoreAction = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preRestoreSnapshot(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preRestoreSnapshot(ObserverContextImpl.createAndPrepare(CP_ENV), snapshot, htd); return null; } @@ -2099,7 +2099,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction cloneAction = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preCloneSnapshot(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preCloneSnapshot(ObserverContextImpl.createAndPrepare(CP_ENV), snapshot, htd); return null; } @@ -2655,7 +2655,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction setUserQuotaAction = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preSetUserQuota(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preSetUserQuota(ObserverContextImpl.createAndPrepare(CP_ENV), null, null); return null; } @@ -2664,7 +2664,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction setUserTableQuotaAction = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preSetUserQuota(ObserverContext.createAndPrepare(CP_ENV), null, + ACCESS_CONTROLLER.preSetUserQuota(ObserverContextImpl.createAndPrepare(CP_ENV), null, TEST_TABLE, null); return null; } @@ -2673,7 +2673,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction setUserNamespaceQuotaAction = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preSetUserQuota(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preSetUserQuota(ObserverContextImpl.createAndPrepare(CP_ENV), null, (String)null, null); return null; } @@ -2682,7 +2682,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction setTableQuotaAction = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preSetTableQuota(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preSetTableQuota(ObserverContextImpl.createAndPrepare(CP_ENV), TEST_TABLE, null); return null; } @@ -2691,7 +2691,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction setNamespaceQuotaAction = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preSetNamespaceQuota(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preSetNamespaceQuota(ObserverContextImpl.createAndPrepare(CP_ENV), null, null); return null; } @@ -2874,14 +2874,14 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction prepareBulkLoadAction = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.prePrepareBulkLoad(ObserverContext.createAndPrepare(RCP_ENV)); + ACCESS_CONTROLLER.prePrepareBulkLoad(ObserverContextImpl.createAndPrepare(RCP_ENV)); return null; } }; AccessTestAction cleanupBulkLoadAction = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preCleanupBulkLoad(ObserverContext.createAndPrepare(RCP_ENV)); + ACCESS_CONTROLLER.preCleanupBulkLoad(ObserverContextImpl.createAndPrepare(RCP_ENV)); return null; } }; @@ -2894,8 +2894,8 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction replicateLogEntriesAction = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preReplicateLogEntries(ObserverContext.createAndPrepare(RSCP_ENV)); - ACCESS_CONTROLLER.postReplicateLogEntries(ObserverContext.createAndPrepare(RSCP_ENV)); + ACCESS_CONTROLLER.preReplicateLogEntries(ObserverContextImpl.createAndPrepare(RSCP_ENV)); + ACCESS_CONTROLLER.postReplicateLogEntries(ObserverContextImpl.createAndPrepare(RSCP_ENV)); return null; } }; @@ -2910,7 +2910,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action1 = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preMoveServers(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preMoveServers(ObserverContextImpl.createAndPrepare(CP_ENV), null, null); return null; } @@ -2925,7 +2925,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action1 = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preMoveTables(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preMoveTables(ObserverContextImpl.createAndPrepare(CP_ENV), null, null); return null; } @@ -2940,7 +2940,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action1 = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preAddRSGroup(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preAddRSGroup(ObserverContextImpl.createAndPrepare(CP_ENV), null); return null; } @@ -2955,7 +2955,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action1 = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preRemoveRSGroup(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preRemoveRSGroup(ObserverContextImpl.createAndPrepare(CP_ENV), null); return null; } @@ -2970,7 +2970,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action1 = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preBalanceRSGroup(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preBalanceRSGroup(ObserverContextImpl.createAndPrepare(CP_ENV), null); return null; } @@ -2985,7 +2985,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preAddReplicationPeer(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preAddReplicationPeer(ObserverContextImpl.createAndPrepare(CP_ENV), "test", null); return null; } @@ -3000,7 +3000,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preRemoveReplicationPeer(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preRemoveReplicationPeer(ObserverContextImpl.createAndPrepare(CP_ENV), "test"); return null; } @@ -3015,7 +3015,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preEnableReplicationPeer(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preEnableReplicationPeer(ObserverContextImpl.createAndPrepare(CP_ENV), "test"); return null; } @@ -3030,7 +3030,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preDisableReplicationPeer(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preDisableReplicationPeer(ObserverContextImpl.createAndPrepare(CP_ENV), "test"); return null; } @@ -3046,7 +3046,7 @@ public class TestAccessController extends SecureTestUtil { @Override public Object run() throws Exception { ACCESS_CONTROLLER.preGetReplicationPeerConfig( - ObserverContext.createAndPrepare(CP_ENV), "test"); + ObserverContextImpl.createAndPrepare(CP_ENV), "test"); return null; } }; @@ -3061,7 +3061,7 @@ public class TestAccessController extends SecureTestUtil { @Override public Object run() throws Exception { ACCESS_CONTROLLER.preUpdateReplicationPeerConfig( - ObserverContext.createAndPrepare(CP_ENV), "test", new ReplicationPeerConfig()); + ObserverContextImpl.createAndPrepare(CP_ENV), "test", new ReplicationPeerConfig()); return null; } }; @@ -3075,7 +3075,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preListReplicationPeers(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preListReplicationPeers(ObserverContextImpl.createAndPrepare(CP_ENV), "test"); return null; } @@ -3106,7 +3106,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction namespaceLockAction = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preRequestLock(ObserverContext.createAndPrepare(CP_ENV), namespace, + ACCESS_CONTROLLER.preRequestLock(ObserverContextImpl.createAndPrepare(CP_ENV), namespace, null, null, LockType.EXCLUSIVE, null); return null; } @@ -3118,7 +3118,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction tableLockAction = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preRequestLock(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preRequestLock(ObserverContextImpl.createAndPrepare(CP_ENV), null, tableName, null, LockType.EXCLUSIVE, null); return null; } @@ -3131,7 +3131,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction regionsLockAction = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preRequestLock(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preRequestLock(ObserverContextImpl.createAndPrepare(CP_ENV), null, null, regionInfos, LockType.EXCLUSIVE, null); return null; } @@ -3145,7 +3145,7 @@ public class TestAccessController extends SecureTestUtil { LockProcedure proc = new LockProcedure(conf, tableName, LockType.EXCLUSIVE, "test", null); AccessTestAction regionLockHeartbeatAction = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preLockHeartbeat(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preLockHeartbeat(ObserverContextImpl.createAndPrepare(CP_ENV), proc, false); return null; } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController3.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController3.java index da411d543f..2fa5d55d87 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController3.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController3.java @@ -33,7 +33,7 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.coprocessor.CoprocessorHost; import org.apache.hadoop.hbase.coprocessor.MasterCoprocessorEnvironment; -import org.apache.hadoop.hbase.coprocessor.ObserverContext; +import org.apache.hadoop.hbase.coprocessor.ObserverContextImpl; import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; import org.apache.hadoop.hbase.coprocessor.RegionServerCoprocessorEnvironment; import org.apache.hadoop.hbase.master.MasterCoprocessorHost; @@ -287,7 +287,7 @@ public class TestAccessController3 extends SecureTestUtil { public Object run() throws Exception { HTableDescriptor htd = new HTableDescriptor(TableName.valueOf(name.getMethodName())); htd.addFamily(new HColumnDescriptor(TEST_FAMILY)); - ACCESS_CONTROLLER.preCreateTable(ObserverContext.createAndPrepare(CP_ENV), htd, null); + ACCESS_CONTROLLER.preCreateTable(ObserverContextImpl.createAndPrepare(CP_ENV), htd, null); return null; } }; 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 6a369558ea..2b0091d658 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 @@ -41,7 +41,7 @@ import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.coprocessor.MasterCoprocessorEnvironment; -import org.apache.hadoop.hbase.coprocessor.ObserverContext; +import org.apache.hadoop.hbase.coprocessor.ObserverContextImpl; import org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.AccessControlService; import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.security.access.Permission.Action; @@ -242,7 +242,7 @@ public class TestNamespaceCommands extends SecureTestUtil { AccessTestAction modifyNamespace = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preModifyNamespace(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preModifyNamespace(ObserverContextImpl.createAndPrepare(CP_ENV), NamespaceDescriptor.create(TEST_NAMESPACE).addConfiguration("abc", "156").build()); return null; } @@ -260,7 +260,7 @@ public class TestNamespaceCommands extends SecureTestUtil { AccessTestAction createNamespace = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preCreateNamespace(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preCreateNamespace(ObserverContextImpl.createAndPrepare(CP_ENV), NamespaceDescriptor.create(TEST_NAMESPACE2).build()); return null; } @@ -269,7 +269,7 @@ public class TestNamespaceCommands extends SecureTestUtil { AccessTestAction deleteNamespace = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preDeleteNamespace(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preDeleteNamespace(ObserverContextImpl.createAndPrepare(CP_ENV), TEST_NAMESPACE2); return null; } @@ -294,7 +294,7 @@ public class TestNamespaceCommands extends SecureTestUtil { AccessTestAction getNamespaceAction = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preGetNamespaceDescriptor(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preGetNamespaceDescriptor(ObserverContextImpl.createAndPrepare(CP_ENV), TEST_NAMESPACE); return null; } @@ -484,7 +484,7 @@ public class TestNamespaceCommands extends SecureTestUtil { public Object run() throws Exception { HTableDescriptor htd = new HTableDescriptor(TableName.valueOf(TEST_TABLE)); htd.addFamily(new HColumnDescriptor(TEST_FAMILY)); - ACCESS_CONTROLLER.preCreateTable(ObserverContext.createAndPrepare(CP_ENV), htd, null); + ACCESS_CONTROLLER.preCreateTable(ObserverContextImpl.createAndPrepare(CP_ENV), htd, null); return null; } }; 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 ed46ab3cd3..d48969edd0 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 @@ -53,7 +53,7 @@ import org.apache.hadoop.hbase.client.SnapshotDescription; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.client.TableDescriptor; import org.apache.hadoop.hbase.coprocessor.MasterCoprocessorEnvironment; -import org.apache.hadoop.hbase.coprocessor.ObserverContext; +import org.apache.hadoop.hbase.coprocessor.ObserverContextImpl; import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; import org.apache.hadoop.hbase.coprocessor.RegionServerCoprocessorEnvironment; import org.apache.hadoop.hbase.filter.BinaryComparator; @@ -483,7 +483,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { public Object run() throws Exception { HTableDescriptor htd = new HTableDescriptor(TEST_TABLE.getTableName()); htd.addFamily(new HColumnDescriptor(TEST_FAMILY)); - ACCESS_CONTROLLER.preCreateTable(ObserverContext.createAndPrepare(CP_ENV), htd, + ACCESS_CONTROLLER.preCreateTable(ObserverContextImpl.createAndPrepare(CP_ENV), htd, null); return null; } @@ -496,7 +496,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { HTableDescriptor htd = new HTableDescriptor(TEST_TABLE.getTableName()); htd.addFamily(new HColumnDescriptor(TEST_FAMILY)); htd.addFamily(new HColumnDescriptor(TEST_FAMILY2)); - ACCESS_CONTROLLER.preModifyTable(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preModifyTable(ObserverContextImpl.createAndPrepare(CP_ENV), TEST_TABLE.getTableName(), htd); return null; } @@ -506,7 +506,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preDeleteTable(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preDeleteTable(ObserverContextImpl.createAndPrepare(CP_ENV), TEST_TABLE.getTableName()); return null; } @@ -516,7 +516,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preTruncateTable(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preTruncateTable(ObserverContextImpl.createAndPrepare(CP_ENV), TEST_TABLE.getTableName()); return null; } @@ -527,7 +527,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { @Override public Object run() throws Exception { HColumnDescriptor hcd = new HColumnDescriptor(TEST_FAMILY2); - ACCESS_CONTROLLER.preAddColumnFamily(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preAddColumnFamily(ObserverContextImpl.createAndPrepare(CP_ENV), TEST_TABLE.getTableName(), hcd); return null; } @@ -538,7 +538,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { @Override public Object run() throws Exception { HColumnDescriptor hcd = new HColumnDescriptor(TEST_FAMILY2); - ACCESS_CONTROLLER.preModifyColumnFamily(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preModifyColumnFamily(ObserverContextImpl.createAndPrepare(CP_ENV), TEST_TABLE.getTableName(), hcd); return null; } @@ -548,7 +548,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preDeleteColumnFamily(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preDeleteColumnFamily(ObserverContextImpl.createAndPrepare(CP_ENV), TEST_TABLE.getTableName(), TEST_FAMILY2); return null; } @@ -558,7 +558,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preEnableTable(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preEnableTable(ObserverContextImpl.createAndPrepare(CP_ENV), TEST_TABLE.getTableName()); return null; } @@ -568,7 +568,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preDisableTable(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preDisableTable(ObserverContextImpl.createAndPrepare(CP_ENV), TEST_TABLE.getTableName()); return null; } @@ -581,7 +581,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { HRegionInfo region = new HRegionInfo(TEST_TABLE.getTableName()); ServerName srcServer = ServerName.valueOf("1.1.1.1", 1, 0); ServerName destServer = ServerName.valueOf("2.2.2.2", 2, 0); - ACCESS_CONTROLLER.preMove(ObserverContext.createAndPrepare(CP_ENV), region, + ACCESS_CONTROLLER.preMove(ObserverContextImpl.createAndPrepare(CP_ENV), region, srcServer, destServer); return null; } @@ -592,7 +592,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { @Override public Object run() throws Exception { HRegionInfo region = new HRegionInfo(TEST_TABLE.getTableName()); - ACCESS_CONTROLLER.preAssign(ObserverContext.createAndPrepare(CP_ENV), region); + ACCESS_CONTROLLER.preAssign(ObserverContextImpl.createAndPrepare(CP_ENV), region); return null; } }, SUPERUSER, USER_ADMIN, USER_RW, USER_RO, USER_OWNER, USER_CREATE, USER_QUAL, USER_NONE); @@ -602,7 +602,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { @Override public Object run() throws Exception { HRegionInfo region = new HRegionInfo(TEST_TABLE.getTableName()); - ACCESS_CONTROLLER.preUnassign(ObserverContext.createAndPrepare(CP_ENV), region, + ACCESS_CONTROLLER.preUnassign(ObserverContextImpl.createAndPrepare(CP_ENV), region, true); return null; } @@ -612,7 +612,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preBalance(ObserverContext.createAndPrepare(CP_ENV)); + ACCESS_CONTROLLER.preBalance(ObserverContextImpl.createAndPrepare(CP_ENV)); return null; } }, SUPERUSER, USER_ADMIN, USER_RW, USER_RO, USER_OWNER, USER_CREATE, USER_QUAL, USER_NONE); @@ -621,7 +621,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preBalanceSwitch(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preBalanceSwitch(ObserverContextImpl.createAndPrepare(CP_ENV), true); return null; } @@ -633,7 +633,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { public Object run() throws Exception { SnapshotDescription snapshot = new SnapshotDescription("foo"); HTableDescriptor htd = new HTableDescriptor(TEST_TABLE.getTableName()); - ACCESS_CONTROLLER.preSnapshot(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preSnapshot(ObserverContextImpl.createAndPrepare(CP_ENV), snapshot, htd); return null; } @@ -644,7 +644,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { @Override public Object run() throws Exception { SnapshotDescription snapshot = new SnapshotDescription("foo"); - ACCESS_CONTROLLER.preListSnapshot(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preListSnapshot(ObserverContextImpl.createAndPrepare(CP_ENV), snapshot); return null; } @@ -656,7 +656,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { public Object run() throws Exception { SnapshotDescription snapshot = new SnapshotDescription("foo"); HTableDescriptor htd = new HTableDescriptor(TEST_TABLE.getTableName()); - ACCESS_CONTROLLER.preCloneSnapshot(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preCloneSnapshot(ObserverContextImpl.createAndPrepare(CP_ENV), snapshot, htd); return null; } @@ -668,7 +668,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { public Object run() throws Exception { SnapshotDescription snapshot = new SnapshotDescription("foo"); HTableDescriptor htd = new HTableDescriptor(TEST_TABLE.getTableName()); - ACCESS_CONTROLLER.preRestoreSnapshot(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preRestoreSnapshot(ObserverContextImpl.createAndPrepare(CP_ENV), snapshot, htd); return null; } @@ -679,7 +679,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { @Override public Object run() throws Exception { SnapshotDescription snapshot = new SnapshotDescription("foo"); - ACCESS_CONTROLLER.preDeleteSnapshot(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preDeleteSnapshot(ObserverContextImpl.createAndPrepare(CP_ENV), snapshot); return null; } @@ -692,7 +692,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { List tableNamesList = Lists.newArrayList(); tableNamesList.add(TEST_TABLE.getTableName()); List descriptors = Lists.newArrayList(); - ACCESS_CONTROLLER.preGetTableDescriptors(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preGetTableDescriptors(ObserverContextImpl.createAndPrepare(CP_ENV), tableNamesList, descriptors, ".+"); return null; } @@ -703,7 +703,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { @Override public Object run() throws Exception { List descriptors = Lists.newArrayList(); - ACCESS_CONTROLLER.preGetTableNames(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preGetTableNames(ObserverContextImpl.createAndPrepare(CP_ENV), descriptors, ".+"); return null; } @@ -714,7 +714,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { @Override public Object run() throws Exception { NamespaceDescriptor ns = NamespaceDescriptor.create("test").build(); - ACCESS_CONTROLLER.preCreateNamespace(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preCreateNamespace(ObserverContextImpl.createAndPrepare(CP_ENV), ns); return null; } @@ -724,7 +724,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preDeleteNamespace(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preDeleteNamespace(ObserverContextImpl.createAndPrepare(CP_ENV), "test"); return null; } @@ -735,7 +735,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { @Override public Object run() throws Exception { NamespaceDescriptor ns = NamespaceDescriptor.create("test").build(); - ACCESS_CONTROLLER.preModifyNamespace(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preModifyNamespace(ObserverContextImpl.createAndPrepare(CP_ENV), ns); return null; } @@ -745,7 +745,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preGetNamespaceDescriptor(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preGetNamespaceDescriptor(ObserverContextImpl.createAndPrepare(CP_ENV), "test"); return null; } @@ -756,7 +756,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { @Override public Object run() throws Exception { List descriptors = Lists.newArrayList(); - ACCESS_CONTROLLER.preListNamespaceDescriptors(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preListNamespaceDescriptors(ObserverContextImpl.createAndPrepare(CP_ENV), descriptors); return null; } @@ -767,7 +767,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { @Override public Object run() throws Exception { ACCESS_CONTROLLER.preSplitRegion( - ObserverContext.createAndPrepare(CP_ENV), + ObserverContextImpl.createAndPrepare(CP_ENV), TEST_TABLE.getTableName(), Bytes.toBytes("ss")); return null; @@ -778,7 +778,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preSetUserQuota(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preSetUserQuota(ObserverContextImpl.createAndPrepare(CP_ENV), "testuser", null); return null; } @@ -788,7 +788,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preSetTableQuota(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preSetTableQuota(ObserverContextImpl.createAndPrepare(CP_ENV), TEST_TABLE.getTableName(), null); return null; } @@ -798,7 +798,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preSetNamespaceQuota(ObserverContext.createAndPrepare(CP_ENV), + ACCESS_CONTROLLER.preSetNamespaceQuota(ObserverContextImpl.createAndPrepare(CP_ENV), "test", null); return null; } @@ -813,7 +813,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preStopRegionServer(ObserverContext.createAndPrepare(RSCP_ENV)); + ACCESS_CONTROLLER.preStopRegionServer(ObserverContextImpl.createAndPrepare(RSCP_ENV)); return null; } }, SUPERUSER, USER_ADMIN, USER_RW, USER_RO, USER_OWNER, USER_CREATE, USER_QUAL, USER_NONE); @@ -822,7 +822,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preRollWALWriterRequest(ObserverContext.createAndPrepare(RSCP_ENV)); + ACCESS_CONTROLLER.preRollWALWriterRequest(ObserverContextImpl.createAndPrepare(RSCP_ENV)); return null; } }, SUPERUSER, USER_ADMIN, USER_RW, USER_RO, USER_OWNER, USER_CREATE, USER_QUAL, USER_NONE); @@ -837,7 +837,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preOpen(ObserverContext.createAndPrepare(RCP_ENV)); + ACCESS_CONTROLLER.preOpen(ObserverContextImpl.createAndPrepare(RCP_ENV)); return null; } }, SUPERUSER, USER_ADMIN, USER_RW, USER_RO, USER_OWNER, USER_CREATE, USER_QUAL, USER_NONE); @@ -846,7 +846,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preFlush(ObserverContext.createAndPrepare(RCP_ENV)); + ACCESS_CONTROLLER.preFlush(ObserverContextImpl.createAndPrepare(RCP_ENV)); return null; } }, SUPERUSER, USER_ADMIN, USER_RW, USER_RO, USER_OWNER, USER_CREATE, USER_QUAL, USER_NONE); @@ -856,7 +856,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { @Override public Object run() throws Exception { List cells = Lists.newArrayList(); - ACCESS_CONTROLLER.preGetOp(ObserverContext.createAndPrepare(RCP_ENV), + ACCESS_CONTROLLER.preGetOp(ObserverContextImpl.createAndPrepare(RCP_ENV), new Get(TEST_ROW), cells); return null; } @@ -866,7 +866,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preExists(ObserverContext.createAndPrepare(RCP_ENV), + ACCESS_CONTROLLER.preExists(ObserverContextImpl.createAndPrepare(RCP_ENV), new Get(TEST_ROW), true); return null; } @@ -876,7 +876,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.prePut(ObserverContext.createAndPrepare(RCP_ENV), + ACCESS_CONTROLLER.prePut(ObserverContextImpl.createAndPrepare(RCP_ENV), new Put(TEST_ROW), new WALEdit(), Durability.USE_DEFAULT); return null; } @@ -886,7 +886,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preDelete(ObserverContext.createAndPrepare(RCP_ENV), + ACCESS_CONTROLLER.preDelete(ObserverContextImpl.createAndPrepare(RCP_ENV), new Delete(TEST_ROW), new WALEdit(), Durability.USE_DEFAULT); return null; } @@ -896,7 +896,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preBatchMutate(ObserverContext.createAndPrepare(RCP_ENV), + ACCESS_CONTROLLER.preBatchMutate(ObserverContextImpl.createAndPrepare(RCP_ENV), new MiniBatchOperationInProgress<>(null, null, null, 0, 0)); return null; } @@ -906,7 +906,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preCheckAndPut(ObserverContext.createAndPrepare(RCP_ENV), + ACCESS_CONTROLLER.preCheckAndPut(ObserverContextImpl.createAndPrepare(RCP_ENV), TEST_ROW, TEST_FAMILY, TEST_Q1, CompareOperator.EQUAL, new BinaryComparator("foo".getBytes()), new Put(TEST_ROW), true); return null; @@ -917,7 +917,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preCheckAndDelete(ObserverContext.createAndPrepare(RCP_ENV), + ACCESS_CONTROLLER.preCheckAndDelete(ObserverContextImpl.createAndPrepare(RCP_ENV), TEST_ROW, TEST_FAMILY, TEST_Q1, CompareOperator.EQUAL, new BinaryComparator("foo".getBytes()), new Delete(TEST_ROW), true); return null; @@ -928,7 +928,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preAppend(ObserverContext.createAndPrepare(RCP_ENV), + ACCESS_CONTROLLER.preAppend(ObserverContextImpl.createAndPrepare(RCP_ENV), new Append(TEST_ROW)); return null; } @@ -938,7 +938,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preIncrement(ObserverContext.createAndPrepare(RCP_ENV), + ACCESS_CONTROLLER.preIncrement(ObserverContextImpl.createAndPrepare(RCP_ENV), new Increment(TEST_ROW)); return null; } @@ -948,7 +948,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preScannerOpen(ObserverContext.createAndPrepare(RCP_ENV), + ACCESS_CONTROLLER.preScannerOpen(ObserverContextImpl.createAndPrepare(RCP_ENV), new Scan(), mock(RegionScanner.class)); return null; } @@ -959,7 +959,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { @Override public Object run() throws Exception { List> paths = Lists.newArrayList(); - ACCESS_CONTROLLER.preBulkLoadHFile(ObserverContext.createAndPrepare(RCP_ENV), + ACCESS_CONTROLLER.preBulkLoadHFile(ObserverContextImpl.createAndPrepare(RCP_ENV), paths); return null; } -- 2.14.1