HBASE-19114 addendum. Split out o.a.h.h.zookeeper from hbase-server and hbase-client. Ruby scripts also used ZooKeeperWatcher.
Signed-off-by: Apekshit Sharma <a...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/671d3609 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/671d3609 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/671d3609 Branch: refs/heads/HBASE-19397-branch-2 Commit: 671d36097f91afb51c6183c6414c4df6bc319d82 Parents: 17de432 Author: Csaba Skrabak <cskra...@hortonworks.com> Authored: Fri Mar 2 11:09:50 2018 -0800 Committer: Apekshit Sharma <a...@apache.org> Committed: Sat Mar 3 21:06:21 2018 +0530 ---------------------------------------------------------------------- bin/draining_servers.rb | 6 +++--- bin/get-active-master.rb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/671d3609/bin/draining_servers.rb ---------------------------------------------------------------------- diff --git a/bin/draining_servers.rb b/bin/draining_servers.rb index 27cc0fa..0d29c19 100644 --- a/bin/draining_servers.rb +++ b/bin/draining_servers.rb @@ -85,7 +85,7 @@ def addServers(_options, hostOrServers) config = HBaseConfiguration.create servers = getServerNames(hostOrServers, config) - zkw = org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher.new(config, 'draining_servers', nil) + zkw = org.apache.hadoop.hbase.zookeeper.ZKWatcher.new(config, 'draining_servers', nil) parentZnode = zkw.znodePaths.drainingZNode begin @@ -102,7 +102,7 @@ def removeServers(_options, hostOrServers) config = HBaseConfiguration.create servers = getServerNames(hostOrServers, config) - zkw = org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher.new(config, 'draining_servers', nil) + zkw = org.apache.hadoop.hbase.zookeeper.ZKWatcher.new(config, 'draining_servers', nil) parentZnode = zkw.znodePaths.drainingZNode begin @@ -119,7 +119,7 @@ end def listServers(_options) config = HBaseConfiguration.create - zkw = org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher.new(config, 'draining_servers', nil) + zkw = org.apache.hadoop.hbase.zookeeper.ZKWatcher.new(config, 'draining_servers', nil) parentZnode = zkw.znodePaths.drainingZNode servers = ZKUtil.listChildrenNoWatch(zkw, parentZnode) http://git-wip-us.apache.org/repos/asf/hbase/blob/671d3609/bin/get-active-master.rb ---------------------------------------------------------------------- diff --git a/bin/get-active-master.rb b/bin/get-active-master.rb index 0cd3d02..d8c96fe 100644 --- a/bin/get-active-master.rb +++ b/bin/get-active-master.rb @@ -20,7 +20,7 @@ include Java java_import org.apache.hadoop.hbase.HBaseConfiguration java_import org.apache.hadoop.hbase.ServerName -java_import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher +java_import org.apache.hadoop.hbase.zookeeper.ZKWatcher java_import org.apache.hadoop.hbase.zookeeper.MasterAddressTracker # disable debug/info logging on this script for clarity @@ -30,7 +30,7 @@ org.apache.log4j.Logger.getLogger('org.apache.zookeeper').setLevel(log_level) config = HBaseConfiguration.create -zk = ZooKeeperWatcher.new(config, 'get-active-master', nil) +zk = ZKWatcher.new(config, 'get-active-master', nil) begin puts MasterAddressTracker.getMasterAddress(zk).getHostname ensure
