You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2015/08/12 03:09:00 UTC
hbase git commit: HBASE-14157 Interfaces implemented by subclasses
should be checked when registering CoprocessorService
Repository: hbase
Updated Branches:
refs/heads/0.98 2eb2017c1 -> 743b6026a
HBASE-14157 Interfaces implemented by subclasses should be checked when registering CoprocessorService
Conflicts:
hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController2.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/743b6026
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/743b6026
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/743b6026
Branch: refs/heads/0.98
Commit: 743b6026a6fd198e3872e7d141d6d1ce2500fd27
Parents: 2eb2017
Author: tedyu <yu...@gmail.com>
Authored: Tue Jul 28 11:10:44 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Aug 11 18:05:55 2015 -0700
----------------------------------------------------------------------
.../hbase/master/MasterCoprocessorHost.java | 4 +++-
.../regionserver/RegionCoprocessorHost.java | 4 +++-
.../RegionServerCoprocessorHost.java | 7 ++++--
.../security/access/TestAccessController2.java | 23 ++++++++++++++++++++
4 files changed, 34 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/743b6026/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterCoprocessorHost.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterCoprocessorHost.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterCoprocessorHost.java
index d1b0a9a..a9bb081 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterCoprocessorHost.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterCoprocessorHost.java
@@ -22,6 +22,7 @@ package org.apache.hadoop.hbase.master;
import java.io.IOException;
import java.util.List;
+import org.apache.commons.lang.ClassUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
@@ -89,7 +90,8 @@ public class MasterCoprocessorHost
public MasterEnvironment createEnvironment(final Class<?> implClass,
final Coprocessor instance, final int priority, final int seq,
final Configuration conf) {
- for (Class<?> c : implClass.getInterfaces()) {
+ for (Object itf : ClassUtils.getAllInterfaces(implClass)) {
+ Class<?> c = (Class<?>) itf;
if (CoprocessorService.class.isAssignableFrom(c)) {
masterServices.registerService(((CoprocessorService)instance).getService());
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/743b6026/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java
index 08aa8b2..e7228f3 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java
@@ -33,6 +33,7 @@ import java.util.regex.Matcher;
import org.apache.commons.collections.map.AbstractReferenceMap;
import org.apache.commons.collections.map.ReferenceMap;
+import org.apache.commons.lang.ClassUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
@@ -359,7 +360,8 @@ public class RegionCoprocessorHost
// uses a different way to be registered and executed.
// It uses a visitor pattern to invoke registered Endpoint
// method.
- for (Class<?> c : implClass.getInterfaces()) {
+ for (Object itf : ClassUtils.getAllInterfaces(implClass)) {
+ Class<?> c = (Class<?>) itf;
if (CoprocessorService.class.isAssignableFrom(c)) {
region.registerService( ((CoprocessorService)instance).getService() );
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/743b6026/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerCoprocessorHost.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerCoprocessorHost.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerCoprocessorHost.java
index 988e39a..99e5ed9 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerCoprocessorHost.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerCoprocessorHost.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.util.Comparator;
import java.util.List;
+import org.apache.commons.lang.ClassUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
@@ -301,9 +302,11 @@ public class RegionServerCoprocessorHost extends
final Configuration conf, final RegionServerServices services) {
super(impl, priority, seq, conf);
this.regionServerServices = services;
- for (Class c : implClass.getInterfaces()) {
+ for (Object itf : ClassUtils.getAllInterfaces(implClass)) {
+ Class<?> c = (Class<?>) itf;
if (SingletonCoprocessorService.class.isAssignableFrom(c)) {
- this.regionServerServices.registerService(((SingletonCoprocessorService) impl).getService());
+ this.regionServerServices.registerService(
+ ((SingletonCoprocessorService) impl).getService());
break;
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/743b6026/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController2.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController2.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController2.java
index b43ace4..7b317c7 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController2.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController2.java
@@ -26,6 +26,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.AuthUtil;
+import org.apache.hadoop.hbase.Coprocessor;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HTableDescriptor;
@@ -38,6 +39,10 @@ import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.ResultScanner;
import org.apache.hadoop.hbase.client.Scan;
+import org.apache.hadoop.hbase.coprocessor.MasterCoprocessorEnvironment;
+import org.apache.hadoop.hbase.coprocessor.RegionServerCoprocessorEnvironment;
+import org.apache.hadoop.hbase.master.MasterCoprocessorHost;
+import org.apache.hadoop.hbase.regionserver.RegionServerCoprocessorHost;
import org.apache.hadoop.hbase.security.User;
import org.apache.hadoop.hbase.security.access.Permission.Action;
import org.apache.hadoop.hbase.testclassification.LargeTests;
@@ -480,6 +485,24 @@ public class TestAccessController2 extends SecureTestUtil {
verifyDenied(TESTGROUP1_USER1, scanTableActionForGroupWithQualifierLevelAccess);
}
+ public static class MyAccessController extends AccessController {
+ }
+
+ @Test
+ public void testCoprocessorLoading() throws Exception {
+ MasterCoprocessorHost cpHost =
+ TEST_UTIL.getMiniHBaseCluster().getMaster().getCoprocessorHost();
+ cpHost.load(MyAccessController.class, Coprocessor.PRIORITY_HIGHEST, conf);
+ AccessController ACCESS_CONTROLLER = (AccessController) cpHost.findCoprocessor(
+ MyAccessController.class.getName());
+ MasterCoprocessorEnvironment CP_ENV = cpHost.createEnvironment(
+ MyAccessController.class, ACCESS_CONTROLLER, Coprocessor.PRIORITY_HIGHEST, 1, conf);
+ RegionServerCoprocessorHost rsHost = TEST_UTIL.getMiniHBaseCluster().getRegionServer(0)
+ .getCoprocessorHost();
+ RegionServerCoprocessorEnvironment RSCP_ENV = rsHost.createEnvironment(
+ MyAccessController.class, ACCESS_CONTROLLER, Coprocessor.PRIORITY_HIGHEST, 1, conf);
+ }
+
@Test
public void testACLZNodeDeletion() throws Exception {
String baseAclZNode = "/hbase/acl/";