From 15231815671ed28396cd17285dbfa65f1bb4ac5a Mon Sep 17 00:00:00 2001 From: mneethiraj Date: Wed, 15 Oct 2014 20:58:41 -0700 Subject: [PATCH] HBASE-12277: Refactored bulk-load methods from AccessController into BulkLoadObserver inerface. Replaced directect references to AccessController in SecureBulkLoadEndpoint with look up for coprocessors that implement BulkLoadObserver. --- .../hadoop/hbase/coprocessor/BulkLoadObserver.java | 35 ++++++++++++++++++++++ .../hadoop/hbase/coprocessor/CoprocessorHost.java | 20 +++++++++++++ .../hbase/security/access/AccessController.java | 19 ++++++++---- .../security/access/SecureBulkLoadEndpoint.java | 33 +++++++++++++++----- .../hadoop/hbase/coprocessor/TestClassLoading.java | 20 +++++++++++++ 5 files changed, 115 insertions(+), 12 deletions(-) create mode 100644 hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BulkLoadObserver.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BulkLoadObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BulkLoadObserver.java new file mode 100644 index 0000000..cf62d44 --- /dev/null +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BulkLoadObserver.java @@ -0,0 +1,35 @@ +package org.apache.hadoop.hbase.coprocessor; + +import java.io.IOException; + +import org.apache.hadoop.hbase.Coprocessor; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; +import org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.CleanupBulkLoadRequest; +import org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.PrepareBulkLoadRequest; + +/** + * Coprocessors implement this interface to observe and mediate bulk load operations. + */ +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC) +@InterfaceStability.Evolving +public interface BulkLoadObserver extends Coprocessor { + /** + * Called as part of SecureBulkLoadEndpoint.prepareBulkLoad() RPC call. + * It can't bypass the default action, e.g., ctx.bypass() won't have effect. + * @param ctx the environment to interact with the framework and master + * @throws IOException + */ + void prePrepareBulkLoad(ObserverContext ctx, + PrepareBulkLoadRequest request) throws IOException; + + /** + * Called as part of SecureBulkLoadEndpoint.cleanupBulkLoad() RPC call. + * It can't bypass the default action, e.g., ctx.bypass() won't have effect. + * @param ctx the environment to interact with the framework and master + * @throws IOException + */ + void preCleanupBulkLoad(ObserverContext ctx, + CleanupBulkLoadRequest request) throws IOException; +} 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 c9bd0b6..4e7c88d 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 @@ -281,6 +281,26 @@ public abstract class CoprocessorHost { } /** + * Find list of coprocessors that extend/implement the given class/interface + * @param class/interface + * @return the list of coprocessors, or null if not found + */ + public List findCoprocessors(Class cls) { + ArrayList ret = new ArrayList(); + + for (E env: coprocessors) { + Coprocessor cp = env.getInstance(); + + if(cp != null) { + if (cls.isAssignableFrom(cp.getClass())) { + ret.add((T)cp); + } + } + } + return ret; + } + + /** * Find a coprocessor environment by class name * @param className the class name * @return the coprocessor, or null if not found 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 400e20a..e43ffb7 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 @@ -63,6 +63,7 @@ import org.apache.hadoop.hbase.client.Query; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.coprocessor.BaseMasterAndRegionObserver; +import org.apache.hadoop.hbase.coprocessor.BulkLoadObserver; import org.apache.hadoop.hbase.coprocessor.CoprocessorException; import org.apache.hadoop.hbase.coprocessor.CoprocessorService; import org.apache.hadoop.hbase.coprocessor.EndpointObserver; @@ -84,6 +85,8 @@ import org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos; import org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.AccessControlService; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription; import org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Quotas; +import org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.CleanupBulkLoadRequest; +import org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.PrepareBulkLoadRequest; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.InternalScanner; import org.apache.hadoop.hbase.regionserver.MiniBatchOperationInProgress; @@ -150,7 +153,7 @@ import com.google.protobuf.Service; @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.CONFIG) public class AccessController extends BaseMasterAndRegionObserver implements RegionServerObserver, - AccessControlService.Interface, CoprocessorService, EndpointObserver { + AccessControlService.Interface, CoprocessorService, EndpointObserver, BulkLoadObserver { public static final Log LOG = LogFactory.getLog(AccessController.class); @@ -1894,8 +1897,11 @@ public class AccessController extends BaseMasterAndRegionObserver * @param e * @throws IOException */ - //TODO this should end up as a coprocessor hook - public void prePrepareBulkLoad(RegionCoprocessorEnvironment e) throws IOException { + @Override + public void prePrepareBulkLoad(ObserverContext ctx, + PrepareBulkLoadRequest request) throws IOException { + RegionCoprocessorEnvironment e = ctx.getEnvironment(); + AuthResult authResult = hasSomeAccess(e, "prePrepareBulkLoad", Action.WRITE); logResult(authResult); if (!authResult.isAllowed()) { @@ -1910,8 +1916,11 @@ public class AccessController extends BaseMasterAndRegionObserver * @param e * @throws IOException */ - //TODO this should end up as a coprocessor hook - public void preCleanupBulkLoad(RegionCoprocessorEnvironment e) throws IOException { + @Override + public void preCleanupBulkLoad(ObserverContext ctx, + CleanupBulkLoadRequest request) throws IOException { + RegionCoprocessorEnvironment e = ctx.getEnvironment(); + AuthResult authResult = hasSomeAccess(e, "preCleanupBulkLoad", Action.WRITE); logResult(authResult); if (!authResult.isAllowed()) { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java index 930d9b3..c483fc4 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java @@ -34,7 +34,9 @@ import org.apache.hadoop.hbase.Coprocessor; import org.apache.hadoop.hbase.CoprocessorEnvironment; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.DoNotRetryIOException; +import org.apache.hadoop.hbase.coprocessor.BulkLoadObserver; import org.apache.hadoop.hbase.coprocessor.CoprocessorService; +import org.apache.hadoop.hbase.coprocessor.ObserverContext; import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; import org.apache.hadoop.hbase.ipc.RequestContext; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; @@ -157,9 +159,17 @@ public class SecureBulkLoadEndpoint extends SecureBulkLoadService PrepareBulkLoadRequest request, RpcCallback done){ try { - if(userProvider.isHBaseSecurityEnabled()) { - getAccessController().prePrepareBulkLoad(env); + List bulkLoadObservers = getBulkLoadObservers(); + + if(bulkLoadObservers != null) { + ObserverContext ctx = new ObserverContext(); + ctx.prepare(env); + + for(BulkLoadObserver bulkLoadObserver : bulkLoadObservers) { + bulkLoadObserver.prePrepareBulkLoad(ctx, request); + } } + String bulkToken = createStagingDir(baseStagingDir, getActiveUser(), ProtobufUtil.toTableName(request.getTableName())).toString(); done.run(PrepareBulkLoadResponse.newBuilder().setBulkToken(bulkToken).build()); @@ -174,9 +184,17 @@ public class SecureBulkLoadEndpoint extends SecureBulkLoadService CleanupBulkLoadRequest request, RpcCallback done) { try { - if (userProvider.isHBaseSecurityEnabled()) { - getAccessController().preCleanupBulkLoad(env); + List bulkLoadObservers = getBulkLoadObservers(); + + if(bulkLoadObservers != null) { + ObserverContext ctx = new ObserverContext(); + ctx.prepare(env); + + for(BulkLoadObserver bulkLoadObserver : bulkLoadObservers) { + bulkLoadObserver.preCleanupBulkLoad(ctx, request); + } } + fs.delete(createStagingDir(baseStagingDir, getActiveUser(), new Path(request.getBulkToken()).getName()), @@ -292,9 +310,10 @@ public class SecureBulkLoadEndpoint extends SecureBulkLoadService done.run(SecureBulkLoadHFilesResponse.newBuilder().setLoaded(loaded).build()); } - private AccessController getAccessController() { - return (AccessController) this.env.getRegion() - .getCoprocessorHost().findCoprocessor(AccessController.class.getName()); + private List getBulkLoadObservers() { + List coprocessorList = this.env.getRegion().getCoprocessorHost().findCoprocessors(BulkLoadObserver.class); + + return coprocessorList; } private Path createStagingDir(Path baseDir, diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java index 2fe121d..1822365 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java @@ -531,6 +531,26 @@ public class TestClassLoading { assertEquals(loadedMasterCoprocessorsVerify, loadedMasterCoprocessors); } + @Test + public void testFindCoprocessors() { + // HBASE 12277: + CoprocessorHost masterCpHost = TEST_UTIL.getHBaseCluster().getMaster().getMasterCoprocessorHost(); + + List masterObservers = masterCpHost.findCoprocessors(MasterObserver.class); + + assertTrue(masterObservers != null && masterObservers.size() > 0); + assertEquals(masterObservers.get(0).getClass().getSimpleName(), masterCoprocessor.getSimpleName()); + + for (HRegion region : TEST_UTIL.getHBaseCluster().getRegionServer(0).getOnlineRegionsLocalContext()) { + CoprocessorHost regionCpHost = region.getCoprocessorHost(); + + List regionObservers = regionCpHost.findCoprocessors(RegionObserver.class); + + assertTrue(regionObservers != null && regionObservers.size() > 0); + assertEquals(regionObservers.get(0).getClass().getSimpleName(), regionServerCoprocessor.getSimpleName()); + } + } + private void waitForTable(TableName name) throws InterruptedException, IOException { // First wait until all regions are online TEST_UTIL.waitTableEnabled(name); -- 1.9.3 (Apple Git-50)