svn commit: r1530784 - /hbase/trunk/bin/region_mover.rb

[mb...@apache.org]

Author: mbertozzi
Date: Wed Oct  9 20:26:03 2013
New Revision: 1530784

URL: http://svn.apache.org/r1530784
Log:
HBASE-9735 region_mover.rb uses the removed HConnection.getZooKeeperWatcher()

Modified:
    hbase/trunk/bin/region_mover.rb

Modified: hbase/trunk/bin/region_mover.rb
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/region_mover.rb?rev=1530784&r1=1530783&r2=1530784&view=diff
==============================================================================
--- hbase/trunk/bin/region_mover.rb (original)
+++ hbase/trunk/bin/region_mover.rb Wed Oct  9 20:26:03 2013
@@ -88,15 +88,20 @@ end
 def getServerNameForRegion(admin, r)
   if r.isMetaRegion()
     # Hack
-    tracker = org.apache.hadoop.hbase.zookeeper.MetaRegionTracker.new(admin.getConnection().getZooKeeperWatcher(), RubyAbortable.new())
-    tracker.start()
-    while not tracker.isLocationAvailable()
-      sleep 0.1
+    zkw = org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher.new(admin.getConfiguration(), "region_mover", nil)
+    begin
+      tracker = org.apache.hadoop.hbase.zookeeper.MetaRegionTracker.new(zkw, RubyAbortable.new())
+      tracker.start()
+      while not tracker.isLocationAvailable()
+        sleep 0.1
+      end
+      # Make a fake servername by appending ','
+      metaServer = tracker.getMetaRegionLocation().toString() + ","
+      tracker.stop()
+      return metaServer
+    ensure
+      zkw.close()
     end
-    # Make a fake servername by appending ','
-    metaServer = tracker.getMetaRegionLocation().toString() + ","
-    tracker.stop()
-    return metaServer
   end
   table = nil
   table = getMetaTable(admin.getConfiguration())