From fb6ed7f687d9de15ae594de68b9942a7bde1b888 Mon Sep 17 00:00:00 2001
From: Ryan Rawson <rawson@apache.org>
Date: Wed, 20 Jan 2010 02:05:04 +0000
Subject: [PATCH] HBASE-2109

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@901034 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt  | 2 ++
 bin/HBase.rb | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index f2d63e43b83..8bcdfe4c242 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -315,6 +315,8 @@ Release 0.21.0 - Unreleased
                ./bin/start-hbase.sh in a checkout
    HBASE-2136  Forward-port the old mapred package
    HBASE-2133  Increase default number of client handlers
+   HBASE-2109  status 'simple' should show total requests per second, also 
+   	       the requests/sec is wrong as is
 
   NEW FEATURES
    HBASE-1961  HBase EC2 scripts
diff --git a/bin/HBase.rb b/bin/HBase.rb
index a4df6b7b840..376988d0133 100644
--- a/bin/HBase.rb
+++ b/bin/HBase.rb
@@ -286,24 +286,28 @@ module HBase
           puts("    %s" % [ server ])
         end
       elsif format != nil and format == "simple"
+        load = 0
+        regions = 0
         puts("%d live servers" % [ status.getServers() ])
         for server in status.getServerInfo()
           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()
         end
         puts("%d dead servers" % [ status.getDeadServers() ])
         for server in status.getDeadServerNames()
           puts("    %s" % [ server ])
         end
+        puts("Aggregate load: %d, regions: %d" % [ load , regions ] )
       else
         puts("%d servers, %d dead, %.4f average load" % \
           [ status.getServers(), status.getDeadServers(), \
-            status.getAverageLoad()]) 
+            status.getAverageLoad()])
       end
     end
-
     def hcd(arg)
       # Return a new HColumnDescriptor made of passed args
       # TODO: This is brittle code.