You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gx...@apache.org on 2019/11/25 11:54:58 UTC
[hbase] branch branch-2 updated: HBASE-23334 The table-lock node of
zk is not needed since HBASE-16786 (#873)
This is an automated email from the ASF dual-hosted git repository.
gxcheng pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 11d0925 HBASE-23334 The table-lock node of zk is not needed since HBASE-16786 (#873)
11d0925 is described below
commit 11d0925814751fd7747f7762c1dc53c898affdeb
Author: bsglz <18...@qq.com>
AuthorDate: Mon Nov 25 19:49:31 2019 +0800
HBASE-23334 The table-lock node of zk is not needed since HBASE-16786 (#873)
Signed-off-by: Guangxu Cheng <gx...@apache.org>
---
.../src/main/java/org/apache/hadoop/hbase/zookeeper/ZNodePaths.java | 4 ----
.../test/java/org/apache/hadoop/hbase/zookeeper/TestZNodePaths.java | 1 -
.../src/main/java/org/apache/hadoop/hbase/zookeeper/ZKWatcher.java | 1 -
3 files changed, 6 deletions(-)
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZNodePaths.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZNodePaths.java
index c5e510f..c8511d4 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZNodePaths.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZNodePaths.java
@@ -75,8 +75,6 @@ public class ZNodePaths {
public final String regionNormalizerZNode;
// znode containing the state of all switches, currently there are split and merge child node.
public final String switchZNode;
- // znode containing the lock for the tables
- public final String tableLockZNode;
// znode containing namespace descriptors
public final String namespaceZNode;
// znode of indicating master maintenance mode
@@ -116,7 +114,6 @@ public class ZNodePaths {
regionNormalizerZNode =
joinZNode(baseZNode, conf.get("zookeeper.znode.regionNormalizer", "normalizer"));
switchZNode = joinZNode(baseZNode, conf.get("zookeeper.znode.switch", "switch"));
- tableLockZNode = joinZNode(baseZNode, conf.get("zookeeper.znode.tableLock", "table-lock"));
namespaceZNode = joinZNode(baseZNode, conf.get("zookeeper.znode.namespace", "namespace"));
masterMaintZNode =
joinZNode(baseZNode, conf.get("zookeeper.znode.masterMaintenance", "master-maintenance"));
@@ -146,7 +143,6 @@ public class ZNodePaths {
.append(", balancerZNode=").append(balancerZNode)
.append(", regionNormalizerZNode=").append(regionNormalizerZNode)
.append(", switchZNode=").append(switchZNode)
- .append(", tableLockZNode=").append(tableLockZNode)
.append(", namespaceZNode=").append(namespaceZNode)
.append(", masterMaintZNode=").append(masterMaintZNode)
.append(", replicationZNode=").append(replicationZNode)
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZNodePaths.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZNodePaths.java
index 1a45379..a8b7644 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZNodePaths.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZNodePaths.java
@@ -46,7 +46,6 @@ public class TestZNodePaths {
assertTrue(znodePaths.isClientReadable(ZNodePaths.joinZNode(znodePaths.tableZNode, "foo")));
assertTrue(znodePaths.isClientReadable(znodePaths.rsZNode));
- assertFalse(znodePaths.isClientReadable(znodePaths.tableLockZNode));
assertFalse(znodePaths.isClientReadable(znodePaths.balancerZNode));
assertFalse(znodePaths.isClientReadable(znodePaths.regionNormalizerZNode));
assertFalse(znodePaths.isClientReadable(znodePaths.clusterStateZNode));
diff --git a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKWatcher.java b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKWatcher.java
index ce00af4..e5ef089 100644
--- a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKWatcher.java
+++ b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKWatcher.java
@@ -186,7 +186,6 @@ public class ZKWatcher implements Watcher, Abortable, Closeable {
ZKUtil.createAndFailSilent(this, znodePaths.tableZNode);
ZKUtil.createAndFailSilent(this, znodePaths.splitLogZNode);
ZKUtil.createAndFailSilent(this, znodePaths.backupMasterAddressesZNode);
- ZKUtil.createAndFailSilent(this, znodePaths.tableLockZNode);
ZKUtil.createAndFailSilent(this, znodePaths.masterMaintZNode);
} catch (KeeperException e) {
throw new ZooKeeperConnectionException(