hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject hbase git commit: HBASE-12580 Zookeeper instantiated even though we might not need it in the shell (Alex Newman)
Date Wed, 26 Nov 2014 21:00:46 GMT
Repository: hbase
Updated Branches:
  refs/heads/master 1c0a06193 -> 57b38339d


HBASE-12580 Zookeeper instantiated even though we might not need it in the shell (Alex Newman)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/57b38339
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/57b38339
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/57b38339

Branch: refs/heads/master
Commit: 57b38339db4683aab01cc92d9b0acac367b9ff36
Parents: 1c0a061
Author: stack <stack@apache.org>
Authored: Wed Nov 26 13:00:29 2014 -0800
Committer: stack <stack@apache.org>
Committed: Wed Nov 26 13:00:29 2014 -0800

----------------------------------------------------------------------
 hbase-shell/src/main/ruby/hbase/admin.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/57b38339/hbase-shell/src/main/ruby/hbase/admin.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/hbase/admin.rb b/hbase-shell/src/main/ruby/hbase/admin.rb
index 2396062..9b65cc3 100644
--- a/hbase-shell/src/main/ruby/hbase/admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/admin.rb
@@ -37,10 +37,6 @@ module Hbase
       @admin = @conn.getAdmin()
       connection = @admin.getConnection()
       @conf = configuration
-      @zk_wrapper = org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher.new(configuration,
-        "admin", nil)
-      zk = @zk_wrapper.getRecoverableZooKeeper().getZooKeeper()
-      @zk_main = org.apache.zookeeper.ZooKeeperMain.new(zk)
       @formatter = formatter
     end
 
@@ -199,6 +195,11 @@ module Hbase
     #----------------------------------------------------------------------------------------------
     # Returns ZooKeeper status dump
     def zk_dump
+      @zk_wrapper = org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher.new(@conf,
+       "admin",
+        nil)
+      zk = @zk_wrapper.getRecoverableZooKeeper().getZooKeeper()
+      @zk_main = org.apache.zookeeper.ZooKeeperMain.new(zk)
       org.apache.hadoop.hbase.zookeeper.ZKUtil::dump(@zk_wrapper)
     end
 


Mime
View raw message