Repository: hbase Updated Branches: refs/heads/HBASE-7912 f202b8beb -> 0ca86556e
HBASE-15559 Fix BaseMasterAndRegionObserver doesn't implement all the methods (Elliott Clark) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0ca86556 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0ca86556 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0ca86556 Branch: refs/heads/HBASE-7912 Commit: 0ca86556e5ee01c3e88926a889da7149ba5833cf Parents: f202b8b Author: tedyu <yuzhih...@gmail.com> Authored: Tue Apr 5 10:25:16 2016 -0700 Committer: tedyu <yuzhih...@gmail.com> Committed: Tue Apr 5 10:25:16 2016 -0700 ---------------------------------------------------------------------- .../coprocessor/BaseMasterAndRegionObserver.java | 19 ++++++++++++++++++- .../hbase/coprocessor/BaseRegionObserver.java | 2 +- 2 files changed, 19 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/0ca86556/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterAndRegionObserver.java ---------------------------------------------------------------------- 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 d601491..428840c 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 @@ -33,6 +33,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; @@ -41,7 +42,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<MasterCoprocessorEnvironment> ctx, @@ -444,6 +445,22 @@ public abstract class BaseMasterAndRegionObserver extends BaseRegionObserver } @Override + public boolean preSetSplitOrMergeEnabled(ObserverContext<MasterCoprocessorEnvironment> ctx, + boolean newValue, + Admin.MasterSwitchType switchType) + throws IOException { + return false; + } + + @Override + public void postSetSplitOrMergeEnabled(ObserverContext<MasterCoprocessorEnvironment> ctx, + boolean newValue, + Admin.MasterSwitchType switchType) + throws IOException { + + } + + @Override public boolean preBalanceSwitch(ObserverContext<MasterCoprocessorEnvironment> ctx, boolean b) throws IOException { return b; http://git-wip-us.apache.org/repos/asf/hbase/blob/0ca86556/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java ---------------------------------------------------------------------- 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 3286f53..da7252b 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 { }
