Apache/hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-23334 The table-lock node of zk is not needed since HBASE-16786 (#873)

Browse Source 
Signed-off-by: Guangxu Cheng <gxcheng@apache.org>
This commit is contained in:
bsglz 2019-11-25 19:49:31 +08:00 committed by Guangxu Cheng
parent b08697ae4a
commit dbbba7932c
3 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZNodePaths.java
View File

@ -75,8 +75,6 @@ public class ZNodePaths {
public final String regionNormalizerZNode; public final String regionNormalizerZNode;
// znode containing the state of all switches, currently there are split and merge child node. // znode containing the state of all switches, currently there are split and merge child node.
public final String switchZNode; public final String switchZNode;
// znode containing the lock for the tables
public final String tableLockZNode;
// znode containing namespace descriptors // znode containing namespace descriptors
public final String namespaceZNode; public final String namespaceZNode;
// znode of indicating master maintenance mode // znode of indicating master maintenance mode
@ -116,7 +114,6 @@ public class ZNodePaths {
regionNormalizerZNode = regionNormalizerZNode =
joinZNode(baseZNode, conf.get("zookeeper.znode.regionNormalizer", "normalizer")); joinZNode(baseZNode, conf.get("zookeeper.znode.regionNormalizer", "normalizer"));
switchZNode = joinZNode(baseZNode, conf.get("zookeeper.znode.switch", "switch")); 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")); namespaceZNode = joinZNode(baseZNode, conf.get("zookeeper.znode.namespace", "namespace"));
masterMaintZNode = masterMaintZNode =
joinZNode(baseZNode, conf.get("zookeeper.znode.masterMaintenance", "master-maintenance")); joinZNode(baseZNode, conf.get("zookeeper.znode.masterMaintenance", "master-maintenance"));
@ -146,7 +143,6 @@ public class ZNodePaths {
.append(", balancerZNode=").append(balancerZNode) .append(", balancerZNode=").append(balancerZNode)
.append(", regionNormalizerZNode=").append(regionNormalizerZNode) .append(", regionNormalizerZNode=").append(regionNormalizerZNode)
.append(", switchZNode=").append(switchZNode) .append(", switchZNode=").append(switchZNode)
.append(", tableLockZNode=").append(tableLockZNode)
.append(", namespaceZNode=").append(namespaceZNode) .append(", namespaceZNode=").append(namespaceZNode)
.append(", masterMaintZNode=").append(masterMaintZNode) .append(", masterMaintZNode=").append(masterMaintZNode)
.append(", replicationZNode=").append(replicationZNode) .append(", replicationZNode=").append(replicationZNode)

1
hbase-client/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZNodePaths.java
View File

@ -46,7 +46,6 @@ public class TestZNodePaths {
assertTrue(znodePaths.isClientReadable(ZNodePaths.joinZNode(znodePaths.tableZNode, "foo"))); assertTrue(znodePaths.isClientReadable(ZNodePaths.joinZNode(znodePaths.tableZNode, "foo")));
assertTrue(znodePaths.isClientReadable(znodePaths.rsZNode)); assertTrue(znodePaths.isClientReadable(znodePaths.rsZNode));
assertFalse(znodePaths.isClientReadable(znodePaths.tableLockZNode));
assertFalse(znodePaths.isClientReadable(znodePaths.balancerZNode)); assertFalse(znodePaths.isClientReadable(znodePaths.balancerZNode));
assertFalse(znodePaths.isClientReadable(znodePaths.regionNormalizerZNode)); assertFalse(znodePaths.isClientReadable(znodePaths.regionNormalizerZNode));
assertFalse(znodePaths.isClientReadable(znodePaths.clusterStateZNode)); assertFalse(znodePaths.isClientReadable(znodePaths.clusterStateZNode));

1
hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKWatcher.java
View File

@ -186,7 +186,6 @@ public class ZKWatcher implements Watcher, Abortable, Closeable {
ZKUtil.createAndFailSilent(this, znodePaths.tableZNode); ZKUtil.createAndFailSilent(this, znodePaths.tableZNode);
ZKUtil.createAndFailSilent(this, znodePaths.splitLogZNode); ZKUtil.createAndFailSilent(this, znodePaths.splitLogZNode);
ZKUtil.createAndFailSilent(this, znodePaths.backupMasterAddressesZNode); ZKUtil.createAndFailSilent(this, znodePaths.backupMasterAddressesZNode);
ZKUtil.createAndFailSilent(this, znodePaths.tableLockZNode);
ZKUtil.createAndFailSilent(this, znodePaths.masterMaintZNode); ZKUtil.createAndFailSilent(this, znodePaths.masterMaintZNode);
} catch (KeeperException e) { } catch (KeeperException e) {
throw new ZooKeeperConnectionException( throw new ZooKeeperConnectionException(