HBASE-15128 Disable region splits and merges switch in master
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6463bbaa Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6463bbaa Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6463bbaa Branch: refs/heads/branch-1.3 Commit: 6463bbaa4110e7b73fa67811ef7ad710e90f9fbd Parents: 5655351 Author: chenheng <chenh...@apache.org> Authored: Mon Feb 29 20:35:18 2016 +0800 Committer: Enis Soztutar <e...@apache.org> Committed: Mon Feb 29 14:39:12 2016 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/client/Admin.java | 25 + .../hadoop/hbase/client/ConnectionManager.java | 14 + .../apache/hadoop/hbase/client/HBaseAdmin.java | 32 + .../hadoop/hbase/protobuf/RequestConverter.java | 49 + .../hbase/zookeeper/ZooKeeperWatcher.java | 10 + .../hbase/protobuf/generated/MasterProtos.java | 4274 ++++++++++++++---- .../protobuf/generated/SnapshotProtos.java | 500 +- .../protobuf/generated/ZooKeeperProtos.java | 462 +- hbase-protocol/src/main/protobuf/Master.proto | 36 + .../src/main/protobuf/ZooKeeper.proto | 7 + .../hadoop/hbase/master/AssignmentManager.java | 12 +- .../org/apache/hadoop/hbase/master/HMaster.java | 28 + .../hadoop/hbase/master/MasterRpcServices.java | 45 + .../org/apache/hadoop/hbase/util/HBaseFsck.java | 37 + .../hbase/zookeeper/SplitOrMergeTracker.java | 151 + .../hbase/client/TestSplitOrMergeStatus.java | 199 + hbase-shell/src/main/ruby/hbase/admin.rb | 32 + hbase-shell/src/main/ruby/shell.rb | 2 + .../ruby/shell/commands/splitormerge_enabled.rb | 41 + .../ruby/shell/commands/splitormerge_switch.rb | 43 + 20 files changed, 4813 insertions(+), 1186 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/6463bbaa/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java index b40f30e..d9361b3 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java @@ -1484,4 +1484,29 @@ public interface Admin extends Abortable, Closeable { * @throws UnsupportedOperationException */ List<SecurityCapability> getSecurityCapabilities() throws IOException; + + /** + * Turn the Split or Merge switches on or off. + * + * @param enabled enabled or not + * @param synchronous If true, it waits until current split() call, if outstanding, to return. + * @param switchTypes switchType list {@link MasterSwitchType} + * @return Previous switch value array + */ + boolean[] setSplitOrMergeEnabled(final boolean enabled, final boolean synchronous, + final MasterSwitchType... switchTypes) throws IOException; + + /** + * Query the current state of the switch + * + * @return true if the switch is enabled, false otherwise. + */ + boolean isSplitOrMergeEnabled(final MasterSwitchType switchType) throws IOException; + + @InterfaceAudience.Public + @InterfaceStability.Evolving + public enum MasterSwitchType { + SPLIT, + MERGE + } } http://git-wip-us.apache.org/repos/asf/hbase/blob/6463bbaa/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java index 5aa604d..dab5392 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java @@ -2091,6 +2091,20 @@ class ConnectionManager { } @Override + public MasterProtos.SetSplitOrMergeEnabledResponse setSplitOrMergeEnabled( + RpcController controller, + MasterProtos.SetSplitOrMergeEnabledRequest request) throws ServiceException { + return stub.setSplitOrMergeEnabled(controller, request); + } + + @Override + public MasterProtos.IsSplitOrMergeEnabledResponse isSplitOrMergeEnabled( + RpcController controller, + MasterProtos.IsSplitOrMergeEnabledRequest request) throws ServiceException { + return stub.isSplitOrMergeEnabled(controller, request); + } + + @Override public IsNormalizerEnabledResponse isNormalizerEnabled(RpcController controller, IsNormalizerEnabledRequest request) throws ServiceException { return stub.isNormalizerEnabled(controller, request); http://git-wip-us.apache.org/repos/asf/hbase/blob/6463bbaa/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java index b2c7f51..3eb7e7a 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java @@ -93,6 +93,7 @@ import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescripti import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.RegionSpecifierType; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema; +import org.apache.hadoop.hbase.protobuf.generated.MasterProtos; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AbortProcedureRequest; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AbortProcedureResponse; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AddColumnRequest; @@ -4609,4 +4610,35 @@ public class HBaseAdmin implements Admin { throw e; } } + + @Override + public boolean[] setSplitOrMergeEnabled(final boolean enabled, final boolean synchronous, + final MasterSwitchType... switchTypes) + throws IOException { + return executeCallable(new MasterCallable<boolean[]>(getConnection()) { + @Override + public boolean[] call(int callTimeout) throws ServiceException { + MasterProtos.SetSplitOrMergeEnabledResponse response = master.setSplitOrMergeEnabled(null, + RequestConverter.buildSetSplitOrMergeEnabledRequest(enabled, synchronous, switchTypes)); + boolean[] result = new boolean[switchTypes.length]; + int i = 0; + for (Boolean prevValue : response.getPrevValueList()) { + result[i++] = prevValue; + } + return result; + } + }); + } + + @Override + public boolean isSplitOrMergeEnabled(final MasterSwitchType switchType) throws IOException { + return executeCallable(new MasterCallable<Boolean>(getConnection()) { + @Override + public Boolean call(int callTimeout) throws ServiceException { + return master.isSplitOrMergeEnabled(null, + RequestConverter.buildIsSplitOrMergeEnabledRequest(switchType)).getEnabled(); + } + }); + } + } http://git-wip-us.apache.org/repos/asf/hbase/blob/6463bbaa/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java index be2bab2..3b9d366 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java @@ -31,6 +31,7 @@ import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Action; +import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Append; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Durability; @@ -77,6 +78,7 @@ import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanRequest; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.RegionSpecifierType; +import org.apache.hadoop.hbase.protobuf.generated.MasterProtos; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AddColumnRequest; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AssignRegionRequest; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.BalanceRequest; @@ -95,6 +97,7 @@ import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsBalancerEnabled import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsCatalogJanitorEnabledRequest; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsMasterRunningRequest; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsNormalizerEnabledRequest; +import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsSplitOrMergeEnabledRequest; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyColumnRequest; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyTableRequest; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MoveRegionRequest; @@ -103,6 +106,7 @@ import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.OfflineRegionRequ import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RunCatalogScanRequest; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetBalancerRunningRequest; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetNormalizerRunningRequest; +import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetSplitOrMergeEnabledRequest; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.TruncateTableRequest; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.UnassignRegionRequest; import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.GetLastFlushedSequenceIdRequest; @@ -1729,4 +1733,49 @@ public final class RequestConverter { public static SetNormalizerRunningRequest buildSetNormalizerRunningRequest(boolean on) { return SetNormalizerRunningRequest.newBuilder().setOn(on).build(); } + + /** + * Creates a protocol buffer IsSplitOrMergeEnabledRequest + * + * @param switchType see {@link org.apache.hadoop.hbase.client.Admin.MasterSwitchType} + * @return a IsSplitOrMergeEnabledRequest + */ + public static IsSplitOrMergeEnabledRequest buildIsSplitOrMergeEnabledRequest( + Admin.MasterSwitchType switchType) { + IsSplitOrMergeEnabledRequest.Builder builder = IsSplitOrMergeEnabledRequest.newBuilder(); + builder.setSwitchType(convert(switchType)); + return builder.build(); + } + + /** + * Creates a protocol buffer SetSplitOrMergeEnabledRequest + * + * @param enabled switch is enabled or not + * @param synchronous set switch sync? + * @param switchTypes see {@link org.apache.hadoop.hbase.client.Admin.MasterSwitchType}, it is + * a list. + * @return a SetSplitOrMergeEnabledRequest + */ + public static SetSplitOrMergeEnabledRequest buildSetSplitOrMergeEnabledRequest(boolean enabled, + boolean synchronous, Admin.MasterSwitchType... switchTypes) { + SetSplitOrMergeEnabledRequest.Builder builder = SetSplitOrMergeEnabledRequest.newBuilder(); + builder.setEnabled(enabled); + builder.setSynchronous(synchronous); + for (Admin.MasterSwitchType switchType : switchTypes) { + builder.addSwitchTypes(convert(switchType)); + } + return builder.build(); + } + + private static MasterProtos.MasterSwitchType convert(Admin.MasterSwitchType switchType) { + switch (switchType) { + case SPLIT: + return MasterProtos.MasterSwitchType.SPLIT; + case MERGE: + return MasterProtos.MasterSwitchType.MERGE; + default: + break; + } + throw new UnsupportedOperationException("Unsupport switch type:" + switchType); + } } http://git-wip-us.apache.org/repos/asf/hbase/blob/6463bbaa/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java index 5b6385f..85749d3 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java @@ -118,6 +118,8 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable { public String balancerZNode; // znode containing the state of region normalizer private String regionNormalizerZNode; + // znode containing the state of all switches, currently there are split and merge child node. + private String switchZNode; // znode containing the lock for the tables public String tableLockZNode; // znode containing the state of recovering regions @@ -445,6 +447,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable { conf.get("zookeeper.znode.balancer", "balancer")); regionNormalizerZNode = ZKUtil.joinZNode(baseZNode, conf.get("zookeeper.znode.regionNormalizer", "normalizer")); + switchZNode = ZKUtil.joinZNode(baseZNode, conf.get("zookeeper.znode.switch", "switch")); tableLockZNode = ZKUtil.joinZNode(baseZNode, conf.get("zookeeper.znode.tableLock", "table-lock")); recoveringRegionsZNode = ZKUtil.joinZNode(baseZNode, @@ -804,4 +807,11 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable { public String getRegionNormalizerZNode() { return regionNormalizerZNode; } + + /** + * @return ZK node for switch + * */ + public String getSwitchZNode() { + return switchZNode; + } }
