This is an automated email from the ASF dual-hosted git repository.
apurtell pushed a commit to branch branch-1
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-1 by this push:
new 336de0a HBASE-21659 Avoid to load duplicate coprocessors in system
config and table descriptor
336de0a is described below
commit 336de0aed40895514764796a38ca850baa010c52
Author: Guanghao Zhang <zg...@apache.org>
AuthorDate: Sat Dec 29 11:51:32 2018 +0800
HBASE-21659 Avoid to load duplicate coprocessors in system config and table
descriptor
Conflicts:
hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionCoprocessorHost.java
Amending-Author: Andrew Purtell <apurt...@apache.org>
---
.../hadoop/hbase/coprocessor/CoprocessorHost.java | 11 +++
.../coprocessor/TestRegionCoprocessorHost.java | 102 +++++++++++++++++++++
2 files changed, 113 insertions(+)
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 275218f..c467149 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
@@ -79,6 +79,9 @@ public abstract class CoprocessorHost<E extends
CoprocessorEnvironment> {
public static final String USER_COPROCESSORS_ENABLED_CONF_KEY =
"hbase.coprocessor.user.enabled";
public static final boolean DEFAULT_USER_COPROCESSORS_ENABLED = true;
+ public static final String SKIP_LOAD_DUPLICATE_TABLE_COPROCESSOR =
+ "hbase.skip.load.duplicate.table.coprocessor";
+ public static final boolean DEFAULT_SKIP_LOAD_DUPLICATE_TABLE_COPROCESSOR =
false;
private static final Log LOG = LogFactory.getLog(CoprocessorHost.class);
protected Abortable abortable;
@@ -203,6 +206,14 @@ public abstract class CoprocessorHost<E extends
CoprocessorEnvironment> {
LOG.debug("Loading coprocessor class " + className + " with path " +
path + " and priority " + priority);
+ boolean skipLoadDuplicateCoprocessor =
conf.getBoolean(SKIP_LOAD_DUPLICATE_TABLE_COPROCESSOR,
+ DEFAULT_SKIP_LOAD_DUPLICATE_TABLE_COPROCESSOR);
+ if (skipLoadDuplicateCoprocessor && findCoprocessor(className) != null) {
+ // If already loaded will just continue
+ LOG.warn("Attempted duplicate loading of " + className + "; skipped");
+ return null;
+ }
+
ClassLoader cl = null;
if (path == null) {
try {
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionCoprocessorHost.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionCoprocessorHost.java
new file mode 100644
index 0000000..fc205af
--- /dev/null
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionCoprocessorHost.java
@@ -0,0 +1,102 @@
+/**
+ * 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 static
org.apache.hadoop.hbase.coprocessor.CoprocessorHost.COPROCESSORS_ENABLED_CONF_KEY;
+import static
org.apache.hadoop.hbase.coprocessor.CoprocessorHost.REGION_COPROCESSOR_CONF_KEY;
+import static
org.apache.hadoop.hbase.coprocessor.CoprocessorHost.SKIP_LOAD_DUPLICATE_TABLE_COPROCESSOR;
+import static
org.apache.hadoop.hbase.coprocessor.CoprocessorHost.USER_COPROCESSORS_ENABLED_CONF_KEY;
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.CoprocessorEnvironment;
+import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HColumnDescriptor;
+import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.testclassification.MediumTests;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@Category({MediumTests.class})
+@RunWith(Parameterized.class)
+public class TestRegionCoprocessorHost {
+
+ private static final HBaseTestingUtility TEST_UTIL = new
HBaseTestingUtility();
+ private final boolean skip;
+
+ @Parameters
+ public static List<Object> params() {
+ return Arrays.asList(new Object[] { new Boolean(true), new Boolean(false)
});
+ }
+
+ public TestRegionCoprocessorHost(boolean skip) {
+ this.skip = skip;
+ }
+
+ @Before
+ public void setUp() throws Exception {
+ Configuration conf = TEST_UTIL.getConfiguration();
+ conf.setBoolean(COPROCESSORS_ENABLED_CONF_KEY, true);
+ conf.setBoolean(USER_COPROCESSORS_ENABLED_CONF_KEY, true);
+ conf.setBoolean(SKIP_LOAD_DUPLICATE_TABLE_COPROCESSOR, skip);
+ conf.set(REGION_COPROCESSOR_CONF_KEY,
SimpleRegionObserver.class.getName());
+ TEST_UTIL.startMiniCluster();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ TEST_UTIL.shutdownMiniCluster();
+ }
+
+ @Test
+ public void testLoadDuplicateCoprocessor() throws Exception {
+ TableName table = TableName.valueOf("testLoadDuplicateCoprocessor");
+ HTableDescriptor tableDesc = new HTableDescriptor(table);
+ tableDesc.addFamily(new HColumnDescriptor("cf"));
+ tableDesc.addCoprocessor(TestRegionObserver.class.getName());
+
+ // Only one coprocessor SimpleRegionObserver loaded if skipping, two
otherwise
+ TEST_UTIL.getHBaseAdmin().createTable(tableDesc);
+ assertEquals(skip ? 1 : 2, TestRegionObserver.getNumInstances());
+ }
+
+ public static final class TestRegionObserver extends SimpleRegionObserver {
+ public static final AtomicInteger numInstances = new AtomicInteger(0);
+
+ @Override
+ public void start(CoprocessorEnvironment e) throws IOException {
+ super.start(e);
+ numInstances.incrementAndGet();
+ }
+
+ public static int getNumInstances() {
+ return numInstances.get();
+ }
+ }
+}
\ No newline at end of file
