Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C12F84BA1 for ; Fri, 10 Jun 2011 23:40:59 +0000 (UTC) Received: (qmail 88371 invoked by uid 500); 10 Jun 2011 23:40:59 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 88348 invoked by uid 500); 10 Jun 2011 23:40:59 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 88341 invoked by uid 99); 10 Jun 2011 23:40:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Jun 2011 23:40:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Jun 2011 23:40:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 66D02238890D; Fri, 10 Jun 2011 23:40:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1134483 - in /hbase/trunk: CHANGES.txt src/main/ruby/hbase/admin.rb Date: Fri, 10 Jun 2011 23:40:38 -0000 To: commits@hbase.apache.org From: stack@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110610234038.66D02238890D@eris.apache.org> Author: stack Date: Fri Jun 10 23:40:38 2011 New Revision: 1134483 URL: http://svn.apache.org/viewvc?rev=1134483&view=rev Log: HBASE-3923 HBASE-1502 Broke Shell's status 'simple' and 'detailed' Modified: hbase/trunk/CHANGES.txt hbase/trunk/src/main/ruby/hbase/admin.rb Modified: hbase/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1134483&r1=1134482&r2=1134483&view=diff ============================================================================== --- hbase/trunk/CHANGES.txt (original) +++ hbase/trunk/CHANGES.txt Fri Jun 10 23:40:38 2011 @@ -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) Modified: hbase/trunk/src/main/ruby/hbase/admin.rb URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/ruby/hbase/admin.rb?rev=1134483&r1=1134482&r2=1134483&view=diff ============================================================================== --- hbase/trunk/src/main/ruby/hbase/admin.rb (original) +++ hbase/trunk/src/main/ruby/hbase/admin.rb Fri Jun 10 23:40:38 2011 @@ -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