HBASE-16024 Revert HBASE-15406 from branch-1.3
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1e15fb4a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1e15fb4a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1e15fb4a Branch: refs/heads/branch-1.3 Commit: 1e15fb4a1fa9b3dfd28f82626611ac7c2b9420c6 Parents: 8c46caa Author: Mikhail Antonov <anto...@apache.org> Authored: Tue Jun 14 19:34:53 2016 -0700 Committer: Mikhail Antonov <anto...@apache.org> Committed: Wed Jun 15 12:09:40 2016 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/client/Admin.java | 13 - .../hadoop/hbase/client/ConnectionManager.java | 7 - .../apache/hadoop/hbase/client/HBaseAdmin.java | 18 +- .../hadoop/hbase/protobuf/RequestConverter.java | 11 +- .../hbase/zookeeper/ZooKeeperWatcher.java | 10 - .../hbase/protobuf/generated/MasterProtos.java | 1891 +++++------------- .../protobuf/generated/ZooKeeperProtos.java | 553 +---- hbase-protocol/src/main/protobuf/Master.proto | 13 - .../src/main/protobuf/ZooKeeper.proto | 10 +- .../hadoop/hbase/master/MasterRpcServices.java | 24 - .../org/apache/hadoop/hbase/util/HBaseFsck.java | 160 +- .../hbase/zookeeper/SplitOrMergeTracker.java | 85 - .../hbase/client/TestSplitOrMergeStatus.java | 39 +- .../apache/hadoop/hbase/util/TestHBaseFsck.java | 59 +- hbase-shell/src/main/ruby/hbase/admin.rb | 2 +- 15 files changed, 622 insertions(+), 2273 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/1e15fb4a/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 7b1d016..a7f93af 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 @@ -1500,15 +1500,10 @@ public interface Admin extends Abortable, Closeable { * * @param enabled enabled or not * @param synchronous If true, it waits until current split() call, if outstanding, to return. - * @param skipLock if false, we will do lock before change switch. - * with the lock, other requests to change the switch will be rejected! - * And when you set it to be false, - * you should call {@link #releaseSplitOrMergeLockAndRollback()} by yourself * @param switchTypes switchType list {@link MasterSwitchType} * @return Previous switch value array */ boolean[] setSplitOrMergeEnabled(final boolean enabled, final boolean synchronous, - final boolean skipLock, final MasterSwitchType... switchTypes) throws IOException; /** @@ -1518,14 +1513,6 @@ public interface Admin extends Abortable, Closeable { */ boolean isSplitOrMergeEnabled(final MasterSwitchType switchType) throws IOException; - /** - * You should call this method after you call - * {@link #setSplitOrMergeEnabled(boolean, boolean, boolean, MasterSwitchType...)} - * with skipLock be false, this method will release the lock created by above method - * and rollback the switch state to be original state before you change switch - * */ - void releaseSplitOrMergeLockAndRollback() throws IOException; - @Deprecated @InterfaceAudience.Public @InterfaceStability.Evolving http://git-wip-us.apache.org/repos/asf/hbase/blob/1e15fb4a/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 a000a41..b055884 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 @@ -2106,13 +2106,6 @@ class ConnectionManager { } @Override - public MasterProtos.ReleaseSplitOrMergeLockAndRollbackResponse - releaseSplitOrMergeLockAndRollback(RpcController controller, - MasterProtos.ReleaseSplitOrMergeLockAndRollbackRequest request) throws ServiceException { - return stub.releaseSplitOrMergeLockAndRollback(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/1e15fb4a/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 bf85ada..37d7735 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 @@ -4808,13 +4808,13 @@ public class HBaseAdmin implements Admin { @Override public boolean[] setSplitOrMergeEnabled(final boolean enabled, final boolean synchronous, - final boolean skipLock, final MasterSwitchType... switchTypes) throws IOException { + 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, - skipLock, switchTypes)); + RequestConverter.buildSetSplitOrMergeEnabledRequest(enabled, synchronous, switchTypes)); boolean[] result = new boolean[switchTypes.length]; int i = 0; for (Boolean prevValue : response.getPrevValueList()) { @@ -4836,18 +4836,6 @@ public class HBaseAdmin implements Admin { }); } - @Override - public void releaseSplitOrMergeLockAndRollback() throws IOException { - executeCallable(new MasterCallable<Void>(getConnection()) { - @Override - public Void call(int callTimeout) throws ServiceException { - master.releaseSplitOrMergeLockAndRollback(null, - RequestConverter.buildReleaseSplitOrMergeLockAndRollbackRequest()); - return null; - } - }); - } - private RpcControllerFactory getRpcControllerFactory() { return rpcControllerFactory; } http://git-wip-us.apache.org/repos/asf/hbase/blob/1e15fb4a/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 337b0f3..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 @@ -104,7 +104,6 @@ import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MoveRegionRequest import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.NormalizeRequest; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.OfflineRegionRequest; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RunCatalogScanRequest; -import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ReleaseSplitOrMergeLockAndRollbackRequest; 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; @@ -1748,13 +1747,6 @@ public final class RequestConverter { return builder.build(); } - public static ReleaseSplitOrMergeLockAndRollbackRequest - buildReleaseSplitOrMergeLockAndRollbackRequest() { - ReleaseSplitOrMergeLockAndRollbackRequest.Builder builder = - ReleaseSplitOrMergeLockAndRollbackRequest.newBuilder(); - return builder.build(); - } - /** * Creates a protocol buffer SetSplitOrMergeEnabledRequest * @@ -1765,11 +1757,10 @@ public final class RequestConverter { * @return a SetSplitOrMergeEnabledRequest */ public static SetSplitOrMergeEnabledRequest buildSetSplitOrMergeEnabledRequest(boolean enabled, - boolean synchronous, boolean skipLock, Admin.MasterSwitchType... switchTypes) { + boolean synchronous, Admin.MasterSwitchType... switchTypes) { SetSplitOrMergeEnabledRequest.Builder builder = SetSplitOrMergeEnabledRequest.newBuilder(); builder.setEnabled(enabled); builder.setSynchronous(synchronous); - builder.setSkipLock(skipLock); for (Admin.MasterSwitchType switchType : switchTypes) { builder.addSwitchTypes(convert(switchType)); } http://git-wip-us.apache.org/repos/asf/hbase/blob/1e15fb4a/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 e6c8eb9..d89041d 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 @@ -120,8 +120,6 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable { 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 switches - private String switchLockZNode; // znode containing the lock for the tables public String tableLockZNode; // znode containing the state of recovering regions @@ -443,7 +441,6 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable { regionNormalizerZNode = ZKUtil.joinZNode(baseZNode, conf.get("zookeeper.znode.regionNormalizer", "normalizer")); switchZNode = ZKUtil.joinZNode(baseZNode, conf.get("zookeeper.znode.switch", "switch")); - switchLockZNode = ZKUtil.joinZNode(switchZNode, "locks"); tableLockZNode = ZKUtil.joinZNode(baseZNode, conf.get("zookeeper.znode.tableLock", "table-lock")); recoveringRegionsZNode = ZKUtil.joinZNode(baseZNode, @@ -787,11 +784,4 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable { public String getSwitchZNode() { return switchZNode; } - - /** - * @return ZK node for switchLock node. - * */ - public String getSwitchLockZNode() { - return switchLockZNode; - } }