Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guangxuCheng merged 1 commit into from
Nov 25, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZNodePaths.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -116,7 +114,6 @@ public ZNodePaths(Configuration conf) {
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"));
Expand Down Expand Up @@ -146,7 +143,6 @@ public String toString() {
.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)
Expand Down
1 change: 0 additions & 1 deletion hbase-client/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZNodePaths.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ public void testIsClientReadable() {
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));
Expand Down
1 change: 0 additions & 1 deletion hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKWatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@ private void createBaseZNodes() throws ZooKeeperConnectionException {
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(
Expand Down