diff --git a/bin/HBase.rb b/bin/HBase.rb index 202d08b..a4df401 100644 --- a/bin/HBase.rb +++ b/bin/HBase.rb @@ -296,24 +296,29 @@ 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() ]) + # 3 is a magic number, if the config was changed then this is wrong. lol! + load += (server.getLoad().getNumberOfRequests() / 3) + 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. diff --git a/src/java/org/apache/hadoop/hbase/HServerLoad.java b/src/java/org/apache/hadoop/hbase/HServerLoad.java index 853e356..0658e82 100644 --- a/src/java/org/apache/hadoop/hbase/HServerLoad.java +++ b/src/java/org/apache/hadoop/hbase/HServerLoad.java @@ -283,7 +283,7 @@ public class HServerLoad implements WritableComparable { */ @Override public String toString() { - return toString(1); + return toString(3); } /**