From 3fb6a0a7aa13e4bf2cf8f006d67a8b392235b780 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Fri, 10 Jun 2011 23:40:38 +0000
Subject: [PATCH] HBASE-3923 HBASE-1502 Broke Shell's status 'simple' and
 'detailed'

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1134483 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                  |  1 +
 src/main/ruby/hbase/admin.rb | 26 ++++++++++++--------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index ae9f069954d..522b35c0a66 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -120,6 +120,7 @@ Release 0.91.0 - Unreleased
    HBASE-3976  Disable block cache on compactions (Karthik Sankarachary)
    HBASE-3979  Trivial fixes in code, document (Ming Ma)
    HBASE-3794  Ability to Discard Bad HTable Puts
+   HBASE-3923  HBASE-1502 Broke Shell's status 'simple' and 'detailed'
 
   IMPROVEMENTS
    HBASE-3290  Max Compaction Size (Nicolas Spiegelberg via Stack)  
diff --git a/src/main/ruby/hbase/admin.rb b/src/main/ruby/hbase/admin.rb
index 61ef4f347d4..0f885e61db1 100644
--- a/src/main/ruby/hbase/admin.rb
+++ b/src/main/ruby/hbase/admin.rb
@@ -290,13 +290,12 @@ module Hbase
         for k, v in status.getRegionsInTransition()
           puts("    %s" % [v])
         end
-        puts("%d live servers" % [ status.getServers() ])
-        for server in status.getServerInfo()
+        puts("%d live servers" % [ status.getServersSize() ])
+        for server in status.getServers()
           puts("    %s:%d %d" % \
-            [ server.getServerAddress().getHostname(),  \
-              server.getServerAddress().getPort(), server.getStartCode() ])
-          puts("        %s" % [ server.getLoad().toString() ])
-          for region in server.getLoad().getRegionsLoad()
+            [ server.getHostname(), server.getPort(), server.getStartcode() ])
+          puts("        %s" % [ status.getLoad(server).toString() ])
+          for name, region in status.getLoad(server).getRegionsLoad()
             puts("        %s" % [ region.getNameAsString() ])
             puts("            %s" % [ region.toString() ])
           end
@@ -308,14 +307,13 @@ module Hbase
       elsif format == "simple"
         load = 0
         regions = 0
-        puts("%d live servers" % [ status.getServers() ])
-        for server in status.getServerInfo()
+        puts("%d live servers" % [ status.getServersSize() ])
+        for server in status.getServers()
           puts("    %s:%d %d" % \
-            [ server.getServerAddress().getHostname(),  \
-              server.getServerAddress().getPort(), server.getStartCode() ])
-          puts("        %s" % [ server.getLoad().toString() ])
-          load += server.getLoad().getNumberOfRequests()
-          regions += server.getLoad().getNumberOfRegions()
+            [ server.getHostname(), server.getPort(), server.getStartcode() ])
+          puts("        %s" % [ status.getLoad(server).toString() ])
+          load += status.getLoad(server).getNumberOfRequests()
+          regions += status.getLoad(server).getNumberOfRegions()
         end
         puts("%d dead servers" % [ status.getDeadServers() ])
         for server in status.getDeadServerNames()
@@ -323,7 +321,7 @@ module Hbase
         end
         puts("Aggregate load: %d, regions: %d" % [ load , regions ] )
       else
-        puts "#{status.getServers} servers, #{status.getDeadServers} dead, #{'%.4f' % status.getAverageLoad} average load"
+        puts "#{status.getServersSize} servers, #{status.getDeadServers} dead, #{'%.4f' % status.getAverageLoad} average load"
       end
     end