You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2018/12/31 12:46:04 UTC
[28/47] hbase git commit: HBASE-21629 draining_servers.rb is broken
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/59f77de7
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/59f77de7
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/59f77de7
Branch: refs/heads/HBASE-21512
Commit: 59f77de723849e4d330167f60e53e44b2763cafc
Parents: 97fd647
Author: Nihal Jain <ni...@gmail.com>
Authored: Sun Dec 23 14:29:53 2018 +0530
Committer: stack <st...@apache.org>
Committed: Sun Dec 23 20:48:43 2018 -0800
----------------------------------------------------------------------
bin/draining_servers.rb | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/59f77de7/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]