diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/CoprocessorEnvironment.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/CoprocessorEnvironment.java index 4022b4b..418d624 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/CoprocessorEnvironment.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/CoprocessorEnvironment.java @@ -19,15 +19,15 @@ package org.apache.hadoop.hbase; -import java.io.IOException; - import org.apache.hadoop.conf.Configuration; import org.apache.yetus.audience.InterfaceAudience; +import org.apache.yetus.audience.InterfaceStability; /** * Coprocessor environment state. */ -@InterfaceAudience.Private +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC) +@InterfaceStability.Evolving public interface CoprocessorEnvironment { /** @return the Coprocessor interface version */ @@ -52,13 +52,4 @@ public interface CoprocessorEnvironment { * @return the classloader for the loaded coprocessor instance */ ClassLoader getClassLoader(); - - /** - * After a coprocessor has been loaded in an encapsulation of an environment, CoprocessorHost - * calls this function to initialize the environment. - */ - void startup() throws IOException; - - /** Clean up the environment. Called by CoprocessorHost when it itself is shutting down. */ - void shutdown(); } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseEnvironment.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseEnvironment.java index 32cef9e..ebbca65 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseEnvironment.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseEnvironment.java @@ -61,7 +61,6 @@ public class BaseEnvironment implements CoprocessorEnviro } /** Initialize the environment */ - @Override public void startup() throws IOException { if (state == Coprocessor.State.INSTALLED || state == Coprocessor.State.STOPPED) { @@ -82,7 +81,6 @@ public class BaseEnvironment implements CoprocessorEnviro } /** Clean up the environment */ - @Override public void shutdown() { if (state == Coprocessor.State.ACTIVE) { state = Coprocessor.State.STOPPING; 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 18210d6..0b0740e 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 @@ -260,7 +260,9 @@ public abstract class CoprocessorHost)env).startup(); + } // HBASE-4014: maintain list of loaded coprocessors for later crash analysis // if server (master or regionserver) aborts. coprocessorNames.add(implClass.getName()); @@ -283,10 +285,15 @@ public abstract class CoprocessorHost)e).shutdown(); + } else { + LOG.warn("Shutdown called on unknown environment: "+ + e.getClass().getName()); } - e.shutdown(); } /** diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorHost.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorHost.java index f7b8c4b..a94a9ed 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorHost.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorHost.java @@ -104,12 +104,6 @@ public class TestCoprocessorHost { } @Override - public void startup() throws IOException {} - - @Override - public void shutdown() {} - - @Override public ClassLoader getClassLoader() { return null; } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java index f116b30..5a0b6bd 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java @@ -279,12 +279,6 @@ public class TestTokenAuthentication { } @Override - public void startup() throws IOException {} - - @Override - public void shutdown() {} - - @Override public ConcurrentMap getSharedData() { return null; } @Override