diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterAndRegionObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterAndRegionObserver.java index 47480564454..65398c20d8b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterAndRegionObserver.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterAndRegionObserver.java @@ -36,6 +36,7 @@ import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; +import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.master.RegionPlan; import org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv; import org.apache.hadoop.hbase.procedure2.ProcedureExecutor; @@ -44,7 +45,7 @@ import org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Quotas; @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC) @InterfaceStability.Evolving -public abstract class BaseMasterAndRegionObserver extends BaseRegionObserver +public class BaseMasterAndRegionObserver extends BaseRegionObserver implements MasterObserver { @Override public void preCreateTable(ObserverContext ctx, @@ -446,6 +447,22 @@ public abstract class BaseMasterAndRegionObserver extends BaseRegionObserver throws IOException { } + @Override + public boolean preSetSplitOrMergeEnabled(ObserverContext ctx, + boolean newValue, + Admin.MasterSwitchType switchType) + throws IOException { + return false; + } + + @Override + public void postSetSplitOrMergeEnabled(ObserverContext ctx, + boolean newValue, + Admin.MasterSwitchType switchType) + throws IOException { + + } + @Override public boolean preBalanceSwitch(ObserverContext ctx, boolean b) throws IOException { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java index 3286f53e768..da7252bef65 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java @@ -71,7 +71,7 @@ import com.google.common.collect.ImmutableList; */ @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC) @InterfaceStability.Evolving -public abstract class BaseRegionObserver implements RegionObserver { +public class BaseRegionObserver implements RegionObserver { @Override public void start(CoprocessorEnvironment e) throws IOException { }