Repository: hbase Updated Branches: refs/heads/branch-2 ad285eae4 -> 7255a1c73
HBASE-21629 draining_servers.rb is broken Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7255a1c7 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7255a1c7 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7255a1c7 Branch: refs/heads/branch-2 Commit: 7255a1c7371b162cd5b51ca07bf00bdbc6ec8a93 Parents: ad285ea Author: Nihal Jain <[email protected]> Authored: Sun Dec 23 14:29:53 2018 +0530 Committer: stack <[email protected]> Committed: Sun Dec 23 20:48:23 2018 -0800 ---------------------------------------------------------------------- bin/draining_servers.rb | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/7255a1c7/bin/draining_servers.rb ---------------------------------------------------------------------- diff --git a/bin/draining_servers.rb b/bin/draining_servers.rb index 0d29c19..a8e20f0 100644 --- a/bin/draining_servers.rb +++ b/bin/draining_servers.rb @@ -27,6 +27,7 @@ java_import org.apache.hadoop.hbase.HBaseConfiguration java_import org.apache.hadoop.hbase.client.ConnectionFactory java_import org.apache.hadoop.hbase.client.HBaseAdmin java_import org.apache.hadoop.hbase.zookeeper.ZKUtil +java_import org.apache.hadoop.hbase.zookeeper.ZNodePaths java_import org.slf4j.LoggerFactory # Name of this script @@ -86,11 +87,11 @@ def addServers(_options, hostOrServers) servers = getServerNames(hostOrServers, config) zkw = org.apache.hadoop.hbase.zookeeper.ZKWatcher.new(config, 'draining_servers', nil) - parentZnode = zkw.znodePaths.drainingZNode begin + parentZnode = zkw.getZNodePaths.drainingZNode for server in servers - node = ZKUtil.joinZNode(parentZnode, server) + node = ZNodePaths.joinZNode(parentZnode, server) ZKUtil.createAndFailSilent(zkw, node) end ensure @@ -103,11 +104,11 @@ def removeServers(_options, hostOrServers) servers = getServerNames(hostOrServers, config) zkw = org.apache.hadoop.hbase.zookeeper.ZKWatcher.new(config, 'draining_servers', nil) - parentZnode = zkw.znodePaths.drainingZNode begin + parentZnode = zkw.getZNodePaths.drainingZNode for server in servers - node = ZKUtil.joinZNode(parentZnode, server) + node = ZNodePaths.joinZNode(parentZnode, server) ZKUtil.deleteNodeFailSilent(zkw, node) end ensure @@ -120,10 +121,14 @@ def listServers(_options) config = HBaseConfiguration.create zkw = org.apache.hadoop.hbase.zookeeper.ZKWatcher.new(config, 'draining_servers', nil) - parentZnode = zkw.znodePaths.drainingZNode - servers = ZKUtil.listChildrenNoWatch(zkw, parentZnode) - servers.each { |server| puts server } + begin + parentZnode = zkw.getZNodePaths.drainingZNode + servers = ZKUtil.listChildrenNoWatch(zkw, parentZnode) + servers.each { |server| puts server } + ensure + zkw.close + end end hostOrServers = ARGV[1..ARGV.size]
