HBASE-9735 region_mover.rb uses the removed HConnection.getZooKeeperWatcher()

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1530784 13f79535-47bb-0310-9956-ffa450edef68

bin/region_mover.rb

@@ -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())
+    zkw = org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher.new(admin.getConfiguration(), "region_mover", nil)
-    tracker.start()
+    begin
-    while not tracker.isLocationAvailable()
+      tracker = org.apache.hadoop.hbase.zookeeper.MetaRegionTracker.new(zkw, RubyAbortable.new())
-      sleep 0.1
+      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())