You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ec...@apache.org on 2016/04/08 21:32:02 UTC
[10/52] [abbrv] hbase git commit: HBASE-15559 Fix
BaseMasterAndRegionObserver doesn't implement all the methods
HBASE-15559 Fix BaseMasterAndRegionObserver doesn't implement all the methods
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b18de5ef
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b18de5ef
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b18de5ef
Branch: refs/heads/HBASE-14850
Commit: b18de5ef4545bda4558b950c96cd4be79f9567af
Parents: 31aee19
Author: Elliott Clark <ec...@apache.org>
Authored: Tue Mar 29 10:10:35 2016 -0700
Committer: Elliott Clark <ec...@apache.org>
Committed: Wed Mar 30 11:17:08 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/b18de5ef/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 4748056..65398c2 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<MasterCoprocessorEnvironment> ctx,
@@ -447,6 +448,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/b18de5ef/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 { }