From 58de18921c76ced2d47f767d16a452fe289cc876 Mon Sep 17 00:00:00 2001 From: ashutosh jindal Date: Thu, 7 May 2015 14:26:22 +0530 Subject: [PATCH] HBASE-13581 - Improve usability for storefile stats in web status pages --- .../java/org/apache/hadoop/hbase/RegionLoad.java | 50 +- .../java/org/apache/hadoop/hbase/ServerLoad.java | 62 +-- .../protobuf/generated/ClusterStatusProtos.java | 559 ++++++++++----------- .../src/main/protobuf/ClusterStatus.proto | 20 +- .../hbase/rest/StorageClusterStatusResource.java | 6 +- .../rest/model/StorageClusterStatusModel.java | 146 +++--- .../generated/StorageClusterStatusMessage.java | 304 +++++------ .../org/apache/hadoop/hbase/rest/XMLSchema.xsd | 22 +- .../protobuf/StorageClusterStatusMessage.proto | 12 +- .../rest/model/TestStorageClusterStatusModel.java | 42 +- .../hbase/tmpl/master/RegionServerListTmpl.jamon | 8 +- .../hbase/tmpl/regionserver/RegionListTmpl.jamon | 13 +- .../master/balancer/StochasticLoadBalancer.java | 2 +- .../hadoop/hbase/regionserver/HRegionServer.java | 30 +- .../hadoop/hbase/util/RegionSizeCalculator.java | 5 +- .../org/apache/hadoop/hbase/TestServerLoad.java | 26 +- .../hbase/util/TestRegionSizeCalculator.java | 19 +- 17 files changed, 662 insertions(+), 664 deletions(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionLoad.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionLoad.java index a6e846e..f5b9ab4 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionLoad.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionLoad.java @@ -71,10 +71,10 @@ public class RegionLoad { } /** - * @return the total size of the storefiles, in MB + * @return the total size of the storefiles */ - public int getStorefileSizeMB() { - return regionLoadPB.getStorefileSizeMB(); + public long getStorefileSize() { + return regionLoadPB.getStorefileSize(); } /** @@ -115,23 +115,23 @@ public class RegionLoad { /** * @return The current total size of root-level indexes for the region, in KB. */ - public int getRootIndexSizeKB() { - return regionLoadPB.getRootIndexSizeKB(); + public long getRootIndexSize() { + return regionLoadPB.getRootIndexSize(); } /** * @return The total size of all index blocks, not just the root level, in KB. */ - public int getTotalStaticIndexSizeKB() { - return regionLoadPB.getTotalStaticIndexSizeKB(); + public long getTotalStaticIndexSize() { + return regionLoadPB.getTotalStaticIndexSize(); } /** * @return The total size of all Bloom filter blocks, not just loaded into the * block cache, in KB. */ - public int getTotalStaticBloomSizeKB() { - return regionLoadPB.getTotalStaticBloomSizeKB(); + public long getTotalStaticBloomSize() { + return regionLoadPB.getTotalStaticBloomSize(); } /** @@ -164,10 +164,10 @@ public class RegionLoad { } /** - * @return the uncompressed size of the storefiles in MB. + * @return the uncompressed size of the storefiles. */ - public int getStoreUncompressedSizeMB() { - return regionLoadPB.getStoreUncompressedSizeMB(); + public long getStoreUncompressedSize() { + return regionLoadPB.getStoreUncompressedSize(); } /** @@ -196,16 +196,16 @@ public class RegionLoad { this.getStores()); sb = Strings.appendKeyValue(sb, "numberOfStorefiles", this.getStorefiles()); - sb = Strings.appendKeyValue(sb, "storefileUncompressedSizeMB", - this.getStoreUncompressedSizeMB()); + sb = Strings.appendKeyValue(sb, "storefileUncompressedSize", + this.getStoreUncompressedSize()); sb = Strings.appendKeyValue(sb, "lastMajorCompactionTimestamp", this.getLastMajorCompactionTs()); - sb = Strings.appendKeyValue(sb, "storefileSizeMB", - this.getStorefileSizeMB()); - if (this.getStoreUncompressedSizeMB() != 0) { + sb = Strings.appendKeyValue(sb, "storefileSize", + this.getStorefileSize()); + if (this.getStoreUncompressedSize() != 0) { sb = Strings.appendKeyValue(sb, "compressionRatio", - String.format("%.4f", (float) this.getStorefileSizeMB() / - (float) this.getStoreUncompressedSizeMB())); + String.format("%.4f", (float) this.getStorefileSize() / + (float) this.getStoreUncompressedSize())); } sb = Strings.appendKeyValue(sb, "memstoreSizeMB", this.getMemStoreSizeMB()); @@ -215,12 +215,12 @@ public class RegionLoad { this.getReadRequestsCount()); sb = Strings.appendKeyValue(sb, "writeRequestsCount", this.getWriteRequestsCount()); - sb = Strings.appendKeyValue(sb, "rootIndexSizeKB", - this.getRootIndexSizeKB()); - sb = Strings.appendKeyValue(sb, "totalStaticIndexSizeKB", - this.getTotalStaticIndexSizeKB()); - sb = Strings.appendKeyValue(sb, "totalStaticBloomSizeKB", - this.getTotalStaticBloomSizeKB()); + sb = Strings.appendKeyValue(sb, "rootIndexSize", + this.getRootIndexSize()); + sb = Strings.appendKeyValue(sb, "totalStaticIndexSize", + this.getTotalStaticIndexSize()); + sb = Strings.appendKeyValue(sb, "totalStaticBloomSize", + this.getTotalStaticBloomSize()); sb = Strings.appendKeyValue(sb, "totalCompactingKVs", this.getTotalCompactingKVs()); sb = Strings.appendKeyValue(sb, "currentCompactedKVs", diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java index 7813b4a..be96c52 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java @@ -44,15 +44,15 @@ import org.apache.hadoop.hbase.util.Strings; public class ServerLoad { private int stores = 0; private int storefiles = 0; - private int storeUncompressedSizeMB = 0; - private int storefileSizeMB = 0; + private long storeUncompressedSize = 0; + private long storefileSize = 0; private int memstoreSizeMB = 0; private int storefileIndexSizeMB = 0; private long readRequestsCount = 0; private long writeRequestsCount = 0; - private int rootIndexSizeKB = 0; - private int totalStaticIndexSizeKB = 0; - private int totalStaticBloomSizeKB = 0; + private long rootIndexSize = 0; + private long totalStaticIndexSize = 0; + private long totalStaticBloomSize = 0; private long totalCompactingKVs = 0; private long currentCompactedKVs = 0; @@ -61,15 +61,15 @@ public class ServerLoad { for (ClusterStatusProtos.RegionLoad rl: serverLoad.getRegionLoadsList()) { stores += rl.getStores(); storefiles += rl.getStorefiles(); - storeUncompressedSizeMB += rl.getStoreUncompressedSizeMB(); - storefileSizeMB += rl.getStorefileSizeMB(); + storeUncompressedSize += rl.getStoreUncompressedSize(); + storefileSize += rl.getStorefileSize(); memstoreSizeMB += rl.getMemstoreSizeMB(); storefileIndexSizeMB += rl.getStorefileIndexSizeMB(); readRequestsCount += rl.getReadRequestsCount(); writeRequestsCount += rl.getWriteRequestsCount(); - rootIndexSizeKB += rl.getRootIndexSizeKB(); - totalStaticIndexSizeKB += rl.getTotalStaticIndexSizeKB(); - totalStaticBloomSizeKB += rl.getTotalStaticBloomSizeKB(); + rootIndexSize += rl.getRootIndexSize(); + totalStaticIndexSize += rl.getTotalStaticIndexSize(); + totalStaticBloomSize += rl.getTotalStaticBloomSize(); totalCompactingKVs += rl.getTotalCompactingKVs(); currentCompactedKVs += rl.getCurrentCompactedKVs(); } @@ -125,12 +125,12 @@ public class ServerLoad { return storefiles; } - public int getStoreUncompressedSizeMB() { - return storeUncompressedSizeMB; + public long getStoreUncompressedSize() { + return storeUncompressedSize; } - public int getStorefileSizeInMB() { - return storefileSizeMB; + public long getStorefileSize() { + return storefileSize; } public int getMemstoreSizeInMB() { @@ -149,16 +149,16 @@ public class ServerLoad { return writeRequestsCount; } - public int getRootIndexSizeKB() { - return rootIndexSizeKB; + public long getRootIndexSize() { + return rootIndexSize; } - public int getTotalStaticIndexSizeKB() { - return totalStaticIndexSizeKB; + public long getTotalStaticIndexSize() { + return totalStaticIndexSize; } - public int getTotalStaticBloomSizeKB() { - return totalStaticBloomSizeKB; + public long getTotalStaticBloomSize() { + return totalStaticBloomSize; } public long getTotalCompactingKVs() { @@ -281,16 +281,16 @@ public class ServerLoad { sb = Strings.appendKeyValue(sb, "numberOfStores", Integer.valueOf(this.stores)); sb = Strings.appendKeyValue(sb, "numberOfStorefiles", Integer.valueOf(this.storefiles)); sb = - Strings.appendKeyValue(sb, "storefileUncompressedSizeMB", - Integer.valueOf(this.storeUncompressedSizeMB)); - sb = Strings.appendKeyValue(sb, "storefileSizeMB", Integer.valueOf(this.storefileSizeMB)); - if (this.storeUncompressedSizeMB != 0) { + Strings.appendKeyValue(sb, "storefileUncompressedSize", + Long.valueOf(this.storeUncompressedSize)); + sb = Strings.appendKeyValue(sb, "storefileSize", Long.valueOf(this.storefileSize)); + if (this.storeUncompressedSize != 0) { sb = Strings.appendKeyValue( sb, "compressionRatio", - String.format("%.4f", (float) this.storefileSizeMB - / (float) this.storeUncompressedSizeMB)); + String.format("%.4f", (float) this.storefileSize + / (float) this.storeUncompressedSize)); } sb = Strings.appendKeyValue(sb, "memstoreSizeMB", Integer.valueOf(this.memstoreSizeMB)); sb = @@ -298,13 +298,13 @@ public class ServerLoad { Integer.valueOf(this.storefileIndexSizeMB)); sb = Strings.appendKeyValue(sb, "readRequestsCount", Long.valueOf(this.readRequestsCount)); sb = Strings.appendKeyValue(sb, "writeRequestsCount", Long.valueOf(this.writeRequestsCount)); - sb = Strings.appendKeyValue(sb, "rootIndexSizeKB", Integer.valueOf(this.rootIndexSizeKB)); + sb = Strings.appendKeyValue(sb, "rootIndexSize", Long.valueOf(this.rootIndexSize)); sb = - Strings.appendKeyValue(sb, "totalStaticIndexSizeKB", - Integer.valueOf(this.totalStaticIndexSizeKB)); + Strings.appendKeyValue(sb, "totalStaticIndexSize", + Long.valueOf(this.totalStaticIndexSize)); sb = - Strings.appendKeyValue(sb, "totalStaticBloomSizeKB", - Integer.valueOf(this.totalStaticBloomSizeKB)); + Strings.appendKeyValue(sb, "totalStaticBloomSize", + Long.valueOf(this.totalStaticBloomSize)); sb = Strings.appendKeyValue(sb, "totalCompactingKVs", Long.valueOf(this.totalCompactingKVs)); sb = Strings.appendKeyValue(sb, "currentCompactedKVs", Long.valueOf(this.currentCompactedKVs)); float compactionProgressPct = Float.NaN; diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClusterStatusProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClusterStatusProtos.java index 5fc4f43..5db7081 100644 --- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClusterStatusProtos.java +++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClusterStatusProtos.java @@ -3317,41 +3317,41 @@ public final class ClusterStatusProtos { */ int getStorefiles(); - // optional uint32 store_uncompressed_size_MB = 4; + // optional uint64 store_uncompressed_size = 4; /** - * optional uint32 store_uncompressed_size_MB = 4; + * optional uint64 store_uncompressed_size = 4; * *
-     ** the total size of the store files for the region, uncompressed, in MB 
+     ** the total size of the store files for the region, uncompressed 
      * 
*/ - boolean hasStoreUncompressedSizeMB(); + boolean hasStoreUncompressedSize(); /** - * optional uint32 store_uncompressed_size_MB = 4; + * optional uint64 store_uncompressed_size = 4; * *
-     ** the total size of the store files for the region, uncompressed, in MB 
+     ** the total size of the store files for the region, uncompressed 
      * 
*/ - int getStoreUncompressedSizeMB(); + long getStoreUncompressedSize(); - // optional uint32 storefile_size_MB = 5; + // optional uint64 storefile_size = 5; /** - * optional uint32 storefile_size_MB = 5; + * optional uint64 storefile_size = 5; * *
-     ** the current total size of the store files for the region, in MB 
+     ** the current total size of the store files for the region 
      * 
*/ - boolean hasStorefileSizeMB(); + boolean hasStorefileSize(); /** - * optional uint32 storefile_size_MB = 5; + * optional uint64 storefile_size = 5; * *
-     ** the current total size of the store files for the region, in MB 
+     ** the current total size of the store files for the region 
      * 
*/ - int getStorefileSizeMB(); + long getStorefileSize(); // optional uint32 memstore_size_MB = 6; /** @@ -3465,45 +3465,45 @@ public final class ClusterStatusProtos { */ long getCurrentCompactedKVs(); - // optional uint32 root_index_size_KB = 12; + // optional uint64 root_index_size = 12; /** - * optional uint32 root_index_size_KB = 12; + * optional uint64 root_index_size = 12; * *
-     ** The current total size of root-level indexes for the region, in KB. 
+     ** The current total size of root-level indexes for the region. 
      * 
*/ - boolean hasRootIndexSizeKB(); + boolean hasRootIndexSize(); /** - * optional uint32 root_index_size_KB = 12; + * optional uint64 root_index_size = 12; * *
-     ** The current total size of root-level indexes for the region, in KB. 
+     ** The current total size of root-level indexes for the region. 
      * 
*/ - int getRootIndexSizeKB(); + long getRootIndexSize(); - // optional uint32 total_static_index_size_KB = 13; + // optional uint64 total_static_index_size = 13; /** - * optional uint32 total_static_index_size_KB = 13; + * optional uint64 total_static_index_size = 13; * *
-     ** The total size of all index blocks, not just the root level, in KB. 
+     ** The total size of all index blocks, not just the root level. 
      * 
*/ - boolean hasTotalStaticIndexSizeKB(); + boolean hasTotalStaticIndexSize(); /** - * optional uint32 total_static_index_size_KB = 13; + * optional uint64 total_static_index_size = 13; * *
-     ** The total size of all index blocks, not just the root level, in KB. 
+     ** The total size of all index blocks, not just the root level. 
      * 
*/ - int getTotalStaticIndexSizeKB(); + long getTotalStaticIndexSize(); - // optional uint32 total_static_bloom_size_KB = 14; + // optional uint64 total_static_bloom_size = 14; /** - * optional uint32 total_static_bloom_size_KB = 14; + * optional uint64 total_static_bloom_size = 14; * *
      **
@@ -3511,9 +3511,9 @@ public final class ClusterStatusProtos {
      * block cache, in KB.
      * 
*/ - boolean hasTotalStaticBloomSizeKB(); + boolean hasTotalStaticBloomSize(); /** - * optional uint32 total_static_bloom_size_KB = 14; + * optional uint64 total_static_bloom_size = 14; * *
      **
@@ -3521,7 +3521,7 @@ public final class ClusterStatusProtos {
      * block cache, in KB.
      * 
*/ - int getTotalStaticBloomSizeKB(); + long getTotalStaticBloomSize(); // optional uint64 complete_sequence_id = 15; /** @@ -3690,12 +3690,12 @@ public final class ClusterStatusProtos { } case 32: { bitField0_ |= 0x00000008; - storeUncompressedSizeMB_ = input.readUInt32(); + storeUncompressedSize_ = input.readUInt64(); break; } case 40: { bitField0_ |= 0x00000010; - storefileSizeMB_ = input.readUInt32(); + storefileSize_ = input.readUInt64(); break; } case 48: { @@ -3730,17 +3730,17 @@ public final class ClusterStatusProtos { } case 96: { bitField0_ |= 0x00000800; - rootIndexSizeKB_ = input.readUInt32(); + rootIndexSize_ = input.readUInt64(); break; } case 104: { bitField0_ |= 0x00001000; - totalStaticIndexSizeKB_ = input.readUInt32(); + totalStaticIndexSize_ = input.readUInt64(); break; } case 112: { bitField0_ |= 0x00002000; - totalStaticBloomSizeKB_ = input.readUInt32(); + totalStaticBloomSize_ = input.readUInt64(); break; } case 120: { @@ -3891,52 +3891,52 @@ public final class ClusterStatusProtos { return storefiles_; } - // optional uint32 store_uncompressed_size_MB = 4; - public static final int STORE_UNCOMPRESSED_SIZE_MB_FIELD_NUMBER = 4; - private int storeUncompressedSizeMB_; + // optional uint64 store_uncompressed_size = 4; + public static final int STORE_UNCOMPRESSED_SIZE_FIELD_NUMBER = 4; + private long storeUncompressedSize_; /** - * optional uint32 store_uncompressed_size_MB = 4; + * optional uint64 store_uncompressed_size = 4; * *
-     ** the total size of the store files for the region, uncompressed, in MB 
+     ** the total size of the store files for the region, uncompressed 
      * 
*/ - public boolean hasStoreUncompressedSizeMB() { + public boolean hasStoreUncompressedSize() { return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * optional uint32 store_uncompressed_size_MB = 4; + * optional uint64 store_uncompressed_size = 4; * *
-     ** the total size of the store files for the region, uncompressed, in MB 
+     ** the total size of the store files for the region, uncompressed 
      * 
*/ - public int getStoreUncompressedSizeMB() { - return storeUncompressedSizeMB_; + public long getStoreUncompressedSize() { + return storeUncompressedSize_; } - // optional uint32 storefile_size_MB = 5; - public static final int STOREFILE_SIZE_MB_FIELD_NUMBER = 5; - private int storefileSizeMB_; + // optional uint64 storefile_size = 5; + public static final int STOREFILE_SIZE_FIELD_NUMBER = 5; + private long storefileSize_; /** - * optional uint32 storefile_size_MB = 5; + * optional uint64 storefile_size = 5; * *
-     ** the current total size of the store files for the region, in MB 
+     ** the current total size of the store files for the region 
      * 
*/ - public boolean hasStorefileSizeMB() { + public boolean hasStorefileSize() { return ((bitField0_ & 0x00000010) == 0x00000010); } /** - * optional uint32 storefile_size_MB = 5; + * optional uint64 storefile_size = 5; * *
-     ** the current total size of the store files for the region, in MB 
+     ** the current total size of the store files for the region 
      * 
*/ - public int getStorefileSizeMB() { - return storefileSizeMB_; + public long getStorefileSize() { + return storefileSize_; } // optional uint32 memstore_size_MB = 6; @@ -4087,59 +4087,59 @@ public final class ClusterStatusProtos { return currentCompactedKVs_; } - // optional uint32 root_index_size_KB = 12; - public static final int ROOT_INDEX_SIZE_KB_FIELD_NUMBER = 12; - private int rootIndexSizeKB_; + // optional uint64 root_index_size = 12; + public static final int ROOT_INDEX_SIZE_FIELD_NUMBER = 12; + private long rootIndexSize_; /** - * optional uint32 root_index_size_KB = 12; + * optional uint64 root_index_size = 12; * *
-     ** The current total size of root-level indexes for the region, in KB. 
+     ** The current total size of root-level indexes for the region. 
      * 
*/ - public boolean hasRootIndexSizeKB() { + public boolean hasRootIndexSize() { return ((bitField0_ & 0x00000800) == 0x00000800); } /** - * optional uint32 root_index_size_KB = 12; + * optional uint64 root_index_size = 12; * *
-     ** The current total size of root-level indexes for the region, in KB. 
+     ** The current total size of root-level indexes for the region. 
      * 
*/ - public int getRootIndexSizeKB() { - return rootIndexSizeKB_; + public long getRootIndexSize() { + return rootIndexSize_; } - // optional uint32 total_static_index_size_KB = 13; - public static final int TOTAL_STATIC_INDEX_SIZE_KB_FIELD_NUMBER = 13; - private int totalStaticIndexSizeKB_; + // optional uint64 total_static_index_size = 13; + public static final int TOTAL_STATIC_INDEX_SIZE_FIELD_NUMBER = 13; + private long totalStaticIndexSize_; /** - * optional uint32 total_static_index_size_KB = 13; + * optional uint64 total_static_index_size = 13; * *
-     ** The total size of all index blocks, not just the root level, in KB. 
+     ** The total size of all index blocks, not just the root level. 
      * 
*/ - public boolean hasTotalStaticIndexSizeKB() { + public boolean hasTotalStaticIndexSize() { return ((bitField0_ & 0x00001000) == 0x00001000); } /** - * optional uint32 total_static_index_size_KB = 13; + * optional uint64 total_static_index_size = 13; * *
-     ** The total size of all index blocks, not just the root level, in KB. 
+     ** The total size of all index blocks, not just the root level. 
      * 
*/ - public int getTotalStaticIndexSizeKB() { - return totalStaticIndexSizeKB_; + public long getTotalStaticIndexSize() { + return totalStaticIndexSize_; } - // optional uint32 total_static_bloom_size_KB = 14; - public static final int TOTAL_STATIC_BLOOM_SIZE_KB_FIELD_NUMBER = 14; - private int totalStaticBloomSizeKB_; + // optional uint64 total_static_bloom_size = 14; + public static final int TOTAL_STATIC_BLOOM_SIZE_FIELD_NUMBER = 14; + private long totalStaticBloomSize_; /** - * optional uint32 total_static_bloom_size_KB = 14; + * optional uint64 total_static_bloom_size = 14; * *
      **
@@ -4147,11 +4147,11 @@ public final class ClusterStatusProtos {
      * block cache, in KB.
      * 
*/ - public boolean hasTotalStaticBloomSizeKB() { + public boolean hasTotalStaticBloomSize() { return ((bitField0_ & 0x00002000) == 0x00002000); } /** - * optional uint32 total_static_bloom_size_KB = 14; + * optional uint64 total_static_bloom_size = 14; * *
      **
@@ -4159,8 +4159,8 @@ public final class ClusterStatusProtos {
      * block cache, in KB.
      * 
*/ - public int getTotalStaticBloomSizeKB() { - return totalStaticBloomSizeKB_; + public long getTotalStaticBloomSize() { + return totalStaticBloomSize_; } // optional uint64 complete_sequence_id = 15; @@ -4287,17 +4287,17 @@ public final class ClusterStatusProtos { regionSpecifier_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance(); stores_ = 0; storefiles_ = 0; - storeUncompressedSizeMB_ = 0; - storefileSizeMB_ = 0; + storeUncompressedSize_ = 0L; + storefileSize_ = 0L; memstoreSizeMB_ = 0; storefileIndexSizeMB_ = 0; readRequestsCount_ = 0L; writeRequestsCount_ = 0L; totalCompactingKVs_ = 0L; currentCompactedKVs_ = 0L; - rootIndexSizeKB_ = 0; - totalStaticIndexSizeKB_ = 0; - totalStaticBloomSizeKB_ = 0; + rootIndexSize_ = 0L; + totalStaticIndexSize_ = 0L; + totalStaticBloomSize_ = 0L; completeSequenceId_ = 0L; dataLocality_ = 0F; lastMajorCompactionTs_ = 0L; @@ -4339,10 +4339,10 @@ public final class ClusterStatusProtos { output.writeUInt32(3, storefiles_); } if (((bitField0_ & 0x00000008) == 0x00000008)) { - output.writeUInt32(4, storeUncompressedSizeMB_); + output.writeUInt64(4, storeUncompressedSize_); } if (((bitField0_ & 0x00000010) == 0x00000010)) { - output.writeUInt32(5, storefileSizeMB_); + output.writeUInt64(5, storefileSize_); } if (((bitField0_ & 0x00000020) == 0x00000020)) { output.writeUInt32(6, memstoreSizeMB_); @@ -4363,13 +4363,13 @@ public final class ClusterStatusProtos { output.writeUInt64(11, currentCompactedKVs_); } if (((bitField0_ & 0x00000800) == 0x00000800)) { - output.writeUInt32(12, rootIndexSizeKB_); + output.writeUInt64(12, rootIndexSize_); } if (((bitField0_ & 0x00001000) == 0x00001000)) { - output.writeUInt32(13, totalStaticIndexSizeKB_); + output.writeUInt64(13, totalStaticIndexSize_); } if (((bitField0_ & 0x00002000) == 0x00002000)) { - output.writeUInt32(14, totalStaticBloomSizeKB_); + output.writeUInt64(14, totalStaticBloomSize_); } if (((bitField0_ & 0x00004000) == 0x00004000)) { output.writeUInt64(15, completeSequenceId_); @@ -4406,11 +4406,11 @@ public final class ClusterStatusProtos { } if (((bitField0_ & 0x00000008) == 0x00000008)) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, storeUncompressedSizeMB_); + .computeUInt64Size(4, storeUncompressedSize_); } if (((bitField0_ & 0x00000010) == 0x00000010)) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, storefileSizeMB_); + .computeUInt64Size(5, storefileSize_); } if (((bitField0_ & 0x00000020) == 0x00000020)) { size += com.google.protobuf.CodedOutputStream @@ -4438,15 +4438,15 @@ public final class ClusterStatusProtos { } if (((bitField0_ & 0x00000800) == 0x00000800)) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(12, rootIndexSizeKB_); + .computeUInt64Size(12, rootIndexSize_); } if (((bitField0_ & 0x00001000) == 0x00001000)) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(13, totalStaticIndexSizeKB_); + .computeUInt64Size(13, totalStaticIndexSize_); } if (((bitField0_ & 0x00002000) == 0x00002000)) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, totalStaticBloomSizeKB_); + .computeUInt64Size(14, totalStaticBloomSize_); } if (((bitField0_ & 0x00004000) == 0x00004000)) { size += com.google.protobuf.CodedOutputStream @@ -4502,15 +4502,15 @@ public final class ClusterStatusProtos { result = result && (getStorefiles() == other.getStorefiles()); } - result = result && (hasStoreUncompressedSizeMB() == other.hasStoreUncompressedSizeMB()); - if (hasStoreUncompressedSizeMB()) { - result = result && (getStoreUncompressedSizeMB() - == other.getStoreUncompressedSizeMB()); + result = result && (hasStoreUncompressedSize() == other.hasStoreUncompressedSize()); + if (hasStoreUncompressedSize()) { + result = result && (getStoreUncompressedSize() + == other.getStoreUncompressedSize()); } - result = result && (hasStorefileSizeMB() == other.hasStorefileSizeMB()); - if (hasStorefileSizeMB()) { - result = result && (getStorefileSizeMB() - == other.getStorefileSizeMB()); + result = result && (hasStorefileSize() == other.hasStorefileSize()); + if (hasStorefileSize()) { + result = result && (getStorefileSize() + == other.getStorefileSize()); } result = result && (hasMemstoreSizeMB() == other.hasMemstoreSizeMB()); if (hasMemstoreSizeMB()) { @@ -4542,20 +4542,20 @@ public final class ClusterStatusProtos { result = result && (getCurrentCompactedKVs() == other.getCurrentCompactedKVs()); } - result = result && (hasRootIndexSizeKB() == other.hasRootIndexSizeKB()); - if (hasRootIndexSizeKB()) { - result = result && (getRootIndexSizeKB() - == other.getRootIndexSizeKB()); + result = result && (hasRootIndexSize() == other.hasRootIndexSize()); + if (hasRootIndexSize()) { + result = result && (getRootIndexSize() + == other.getRootIndexSize()); } - result = result && (hasTotalStaticIndexSizeKB() == other.hasTotalStaticIndexSizeKB()); - if (hasTotalStaticIndexSizeKB()) { - result = result && (getTotalStaticIndexSizeKB() - == other.getTotalStaticIndexSizeKB()); + result = result && (hasTotalStaticIndexSize() == other.hasTotalStaticIndexSize()); + if (hasTotalStaticIndexSize()) { + result = result && (getTotalStaticIndexSize() + == other.getTotalStaticIndexSize()); } - result = result && (hasTotalStaticBloomSizeKB() == other.hasTotalStaticBloomSizeKB()); - if (hasTotalStaticBloomSizeKB()) { - result = result && (getTotalStaticBloomSizeKB() - == other.getTotalStaticBloomSizeKB()); + result = result && (hasTotalStaticBloomSize() == other.hasTotalStaticBloomSize()); + if (hasTotalStaticBloomSize()) { + result = result && (getTotalStaticBloomSize() + == other.getTotalStaticBloomSize()); } result = result && (hasCompleteSequenceId() == other.hasCompleteSequenceId()); if (hasCompleteSequenceId()) { @@ -4598,13 +4598,13 @@ public final class ClusterStatusProtos { hash = (37 * hash) + STOREFILES_FIELD_NUMBER; hash = (53 * hash) + getStorefiles(); } - if (hasStoreUncompressedSizeMB()) { - hash = (37 * hash) + STORE_UNCOMPRESSED_SIZE_MB_FIELD_NUMBER; - hash = (53 * hash) + getStoreUncompressedSizeMB(); + if (hasStoreUncompressedSize()) { + hash = (37 * hash) + STORE_UNCOMPRESSED_SIZE_FIELD_NUMBER; + hash = (53 * hash) + hashLong(getStoreUncompressedSize()); } - if (hasStorefileSizeMB()) { - hash = (37 * hash) + STOREFILE_SIZE_MB_FIELD_NUMBER; - hash = (53 * hash) + getStorefileSizeMB(); + if (hasStorefileSize()) { + hash = (37 * hash) + STOREFILE_SIZE_FIELD_NUMBER; + hash = (53 * hash) + hashLong(getStorefileSize()); } if (hasMemstoreSizeMB()) { hash = (37 * hash) + MEMSTORE_SIZE_MB_FIELD_NUMBER; @@ -4630,17 +4630,17 @@ public final class ClusterStatusProtos { hash = (37 * hash) + CURRENT_COMPACTED_KVS_FIELD_NUMBER; hash = (53 * hash) + hashLong(getCurrentCompactedKVs()); } - if (hasRootIndexSizeKB()) { - hash = (37 * hash) + ROOT_INDEX_SIZE_KB_FIELD_NUMBER; - hash = (53 * hash) + getRootIndexSizeKB(); + if (hasRootIndexSize()) { + hash = (37 * hash) + ROOT_INDEX_SIZE_FIELD_NUMBER; + hash = (53 * hash) + hashLong(getRootIndexSize()); } - if (hasTotalStaticIndexSizeKB()) { - hash = (37 * hash) + TOTAL_STATIC_INDEX_SIZE_KB_FIELD_NUMBER; - hash = (53 * hash) + getTotalStaticIndexSizeKB(); + if (hasTotalStaticIndexSize()) { + hash = (37 * hash) + TOTAL_STATIC_INDEX_SIZE_FIELD_NUMBER; + hash = (53 * hash) + hashLong(getTotalStaticIndexSize()); } - if (hasTotalStaticBloomSizeKB()) { - hash = (37 * hash) + TOTAL_STATIC_BLOOM_SIZE_KB_FIELD_NUMBER; - hash = (53 * hash) + getTotalStaticBloomSizeKB(); + if (hasTotalStaticBloomSize()) { + hash = (37 * hash) + TOTAL_STATIC_BLOOM_SIZE_FIELD_NUMBER; + hash = (53 * hash) + hashLong(getTotalStaticBloomSize()); } if (hasCompleteSequenceId()) { hash = (37 * hash) + COMPLETE_SEQUENCE_ID_FIELD_NUMBER; @@ -4780,9 +4780,9 @@ public final class ClusterStatusProtos { bitField0_ = (bitField0_ & ~0x00000002); storefiles_ = 0; bitField0_ = (bitField0_ & ~0x00000004); - storeUncompressedSizeMB_ = 0; + storeUncompressedSize_ = 0L; bitField0_ = (bitField0_ & ~0x00000008); - storefileSizeMB_ = 0; + storefileSize_ = 0L; bitField0_ = (bitField0_ & ~0x00000010); memstoreSizeMB_ = 0; bitField0_ = (bitField0_ & ~0x00000020); @@ -4796,11 +4796,11 @@ public final class ClusterStatusProtos { bitField0_ = (bitField0_ & ~0x00000200); currentCompactedKVs_ = 0L; bitField0_ = (bitField0_ & ~0x00000400); - rootIndexSizeKB_ = 0; + rootIndexSize_ = 0L; bitField0_ = (bitField0_ & ~0x00000800); - totalStaticIndexSizeKB_ = 0; + totalStaticIndexSize_ = 0L; bitField0_ = (bitField0_ & ~0x00001000); - totalStaticBloomSizeKB_ = 0; + totalStaticBloomSize_ = 0L; bitField0_ = (bitField0_ & ~0x00002000); completeSequenceId_ = 0L; bitField0_ = (bitField0_ & ~0x00004000); @@ -4861,11 +4861,11 @@ public final class ClusterStatusProtos { if (((from_bitField0_ & 0x00000008) == 0x00000008)) { to_bitField0_ |= 0x00000008; } - result.storeUncompressedSizeMB_ = storeUncompressedSizeMB_; + result.storeUncompressedSize_ = storeUncompressedSize_; if (((from_bitField0_ & 0x00000010) == 0x00000010)) { to_bitField0_ |= 0x00000010; } - result.storefileSizeMB_ = storefileSizeMB_; + result.storefileSize_ = storefileSize_; if (((from_bitField0_ & 0x00000020) == 0x00000020)) { to_bitField0_ |= 0x00000020; } @@ -4893,15 +4893,15 @@ public final class ClusterStatusProtos { if (((from_bitField0_ & 0x00000800) == 0x00000800)) { to_bitField0_ |= 0x00000800; } - result.rootIndexSizeKB_ = rootIndexSizeKB_; + result.rootIndexSize_ = rootIndexSize_; if (((from_bitField0_ & 0x00001000) == 0x00001000)) { to_bitField0_ |= 0x00001000; } - result.totalStaticIndexSizeKB_ = totalStaticIndexSizeKB_; + result.totalStaticIndexSize_ = totalStaticIndexSize_; if (((from_bitField0_ & 0x00002000) == 0x00002000)) { to_bitField0_ |= 0x00002000; } - result.totalStaticBloomSizeKB_ = totalStaticBloomSizeKB_; + result.totalStaticBloomSize_ = totalStaticBloomSize_; if (((from_bitField0_ & 0x00004000) == 0x00004000)) { to_bitField0_ |= 0x00004000; } @@ -4948,11 +4948,11 @@ public final class ClusterStatusProtos { if (other.hasStorefiles()) { setStorefiles(other.getStorefiles()); } - if (other.hasStoreUncompressedSizeMB()) { - setStoreUncompressedSizeMB(other.getStoreUncompressedSizeMB()); + if (other.hasStoreUncompressedSize()) { + setStoreUncompressedSize(other.getStoreUncompressedSize()); } - if (other.hasStorefileSizeMB()) { - setStorefileSizeMB(other.getStorefileSizeMB()); + if (other.hasStorefileSize()) { + setStorefileSize(other.getStorefileSize()); } if (other.hasMemstoreSizeMB()) { setMemstoreSizeMB(other.getMemstoreSizeMB()); @@ -4972,14 +4972,14 @@ public final class ClusterStatusProtos { if (other.hasCurrentCompactedKVs()) { setCurrentCompactedKVs(other.getCurrentCompactedKVs()); } - if (other.hasRootIndexSizeKB()) { - setRootIndexSizeKB(other.getRootIndexSizeKB()); + if (other.hasRootIndexSize()) { + setRootIndexSize(other.getRootIndexSize()); } - if (other.hasTotalStaticIndexSizeKB()) { - setTotalStaticIndexSizeKB(other.getTotalStaticIndexSizeKB()); + if (other.hasTotalStaticIndexSize()) { + setTotalStaticIndexSize(other.getTotalStaticIndexSize()); } - if (other.hasTotalStaticBloomSizeKB()) { - setTotalStaticBloomSizeKB(other.getTotalStaticBloomSizeKB()); + if (other.hasTotalStaticBloomSize()) { + setTotalStaticBloomSize(other.getTotalStaticBloomSize()); } if (other.hasCompleteSequenceId()) { setCompleteSequenceId(other.getCompleteSequenceId()); @@ -5308,100 +5308,100 @@ public final class ClusterStatusProtos { return this; } - // optional uint32 store_uncompressed_size_MB = 4; - private int storeUncompressedSizeMB_ ; + // optional uint64 store_uncompressed_size = 4; + private long storeUncompressedSize_ ; /** - * optional uint32 store_uncompressed_size_MB = 4; + * optional uint64 store_uncompressed_size = 4; * *
-       ** the total size of the store files for the region, uncompressed, in MB 
+       ** the total size of the store files for the region, uncompressed 
        * 
*/ - public boolean hasStoreUncompressedSizeMB() { + public boolean hasStoreUncompressedSize() { return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * optional uint32 store_uncompressed_size_MB = 4; + * optional uint64 store_uncompressed_size = 4; * *
-       ** the total size of the store files for the region, uncompressed, in MB 
+       ** the total size of the store files for the region, uncompressed 
        * 
*/ - public int getStoreUncompressedSizeMB() { - return storeUncompressedSizeMB_; + public long getStoreUncompressedSize() { + return storeUncompressedSize_; } /** - * optional uint32 store_uncompressed_size_MB = 4; + * optional uint64 store_uncompressed_size = 4; * *
-       ** the total size of the store files for the region, uncompressed, in MB 
+       ** the total size of the store files for the region, uncompressed 
        * 
*/ - public Builder setStoreUncompressedSizeMB(int value) { + public Builder setStoreUncompressedSize(long value) { bitField0_ |= 0x00000008; - storeUncompressedSizeMB_ = value; + storeUncompressedSize_ = value; onChanged(); return this; } /** - * optional uint32 store_uncompressed_size_MB = 4; + * optional uint64 store_uncompressed_size = 4; * *
-       ** the total size of the store files for the region, uncompressed, in MB 
+       ** the total size of the store files for the region, uncompressed 
        * 
*/ - public Builder clearStoreUncompressedSizeMB() { + public Builder clearStoreUncompressedSize() { bitField0_ = (bitField0_ & ~0x00000008); - storeUncompressedSizeMB_ = 0; + storeUncompressedSize_ = 0L; onChanged(); return this; } - // optional uint32 storefile_size_MB = 5; - private int storefileSizeMB_ ; + // optional uint64 storefile_size = 5; + private long storefileSize_ ; /** - * optional uint32 storefile_size_MB = 5; + * optional uint64 storefile_size = 5; * *
-       ** the current total size of the store files for the region, in MB 
+       ** the current total size of the store files for the region 
        * 
*/ - public boolean hasStorefileSizeMB() { + public boolean hasStorefileSize() { return ((bitField0_ & 0x00000010) == 0x00000010); } /** - * optional uint32 storefile_size_MB = 5; + * optional uint64 storefile_size = 5; * *
-       ** the current total size of the store files for the region, in MB 
+       ** the current total size of the store files for the region 
        * 
*/ - public int getStorefileSizeMB() { - return storefileSizeMB_; + public long getStorefileSize() { + return storefileSize_; } /** - * optional uint32 storefile_size_MB = 5; + * optional uint64 storefile_size = 5; * *
-       ** the current total size of the store files for the region, in MB 
+       ** the current total size of the store files for the region 
        * 
*/ - public Builder setStorefileSizeMB(int value) { + public Builder setStorefileSize(long value) { bitField0_ |= 0x00000010; - storefileSizeMB_ = value; + storefileSize_ = value; onChanged(); return this; } /** - * optional uint32 storefile_size_MB = 5; + * optional uint64 storefile_size = 5; * *
-       ** the current total size of the store files for the region, in MB 
+       ** the current total size of the store files for the region 
        * 
*/ - public Builder clearStorefileSizeMB() { + public Builder clearStorefileSize() { bitField0_ = (bitField0_ & ~0x00000010); - storefileSizeMB_ = 0; + storefileSize_ = 0L; onChanged(); return this; } @@ -5708,108 +5708,108 @@ public final class ClusterStatusProtos { return this; } - // optional uint32 root_index_size_KB = 12; - private int rootIndexSizeKB_ ; + // optional uint64 root_index_size = 12; + private long rootIndexSize_ ; /** - * optional uint32 root_index_size_KB = 12; + * optional uint64 root_index_size = 12; * *
-       ** The current total size of root-level indexes for the region, in KB. 
+       ** The current total size of root-level indexes for the region. 
        * 
*/ - public boolean hasRootIndexSizeKB() { + public boolean hasRootIndexSize() { return ((bitField0_ & 0x00000800) == 0x00000800); } /** - * optional uint32 root_index_size_KB = 12; + * optional uint64 root_index_size = 12; * *
-       ** The current total size of root-level indexes for the region, in KB. 
+       ** The current total size of root-level indexes for the region. 
        * 
*/ - public int getRootIndexSizeKB() { - return rootIndexSizeKB_; + public long getRootIndexSize() { + return rootIndexSize_; } /** - * optional uint32 root_index_size_KB = 12; + * optional uint64 root_index_size = 12; * *
-       ** The current total size of root-level indexes for the region, in KB. 
+       ** The current total size of root-level indexes for the region. 
        * 
*/ - public Builder setRootIndexSizeKB(int value) { + public Builder setRootIndexSize(long value) { bitField0_ |= 0x00000800; - rootIndexSizeKB_ = value; + rootIndexSize_ = value; onChanged(); return this; } /** - * optional uint32 root_index_size_KB = 12; + * optional uint64 root_index_size = 12; * *
-       ** The current total size of root-level indexes for the region, in KB. 
+       ** The current total size of root-level indexes for the region. 
        * 
*/ - public Builder clearRootIndexSizeKB() { + public Builder clearRootIndexSize() { bitField0_ = (bitField0_ & ~0x00000800); - rootIndexSizeKB_ = 0; + rootIndexSize_ = 0L; onChanged(); return this; } - // optional uint32 total_static_index_size_KB = 13; - private int totalStaticIndexSizeKB_ ; + // optional uint64 total_static_index_size = 13; + private long totalStaticIndexSize_ ; /** - * optional uint32 total_static_index_size_KB = 13; + * optional uint64 total_static_index_size = 13; * *
-       ** The total size of all index blocks, not just the root level, in KB. 
+       ** The total size of all index blocks, not just the root level. 
        * 
*/ - public boolean hasTotalStaticIndexSizeKB() { + public boolean hasTotalStaticIndexSize() { return ((bitField0_ & 0x00001000) == 0x00001000); } /** - * optional uint32 total_static_index_size_KB = 13; + * optional uint64 total_static_index_size = 13; * *
-       ** The total size of all index blocks, not just the root level, in KB. 
+       ** The total size of all index blocks, not just the root level. 
        * 
*/ - public int getTotalStaticIndexSizeKB() { - return totalStaticIndexSizeKB_; + public long getTotalStaticIndexSize() { + return totalStaticIndexSize_; } /** - * optional uint32 total_static_index_size_KB = 13; + * optional uint64 total_static_index_size = 13; * *
-       ** The total size of all index blocks, not just the root level, in KB. 
+       ** The total size of all index blocks, not just the root level. 
        * 
*/ - public Builder setTotalStaticIndexSizeKB(int value) { + public Builder setTotalStaticIndexSize(long value) { bitField0_ |= 0x00001000; - totalStaticIndexSizeKB_ = value; + totalStaticIndexSize_ = value; onChanged(); return this; } /** - * optional uint32 total_static_index_size_KB = 13; + * optional uint64 total_static_index_size = 13; * *
-       ** The total size of all index blocks, not just the root level, in KB. 
+       ** The total size of all index blocks, not just the root level. 
        * 
*/ - public Builder clearTotalStaticIndexSizeKB() { + public Builder clearTotalStaticIndexSize() { bitField0_ = (bitField0_ & ~0x00001000); - totalStaticIndexSizeKB_ = 0; + totalStaticIndexSize_ = 0L; onChanged(); return this; } - // optional uint32 total_static_bloom_size_KB = 14; - private int totalStaticBloomSizeKB_ ; + // optional uint64 total_static_bloom_size = 14; + private long totalStaticBloomSize_ ; /** - * optional uint32 total_static_bloom_size_KB = 14; + * optional uint64 total_static_bloom_size = 14; * *
        **
@@ -5817,11 +5817,11 @@ public final class ClusterStatusProtos {
        * block cache, in KB.
        * 
*/ - public boolean hasTotalStaticBloomSizeKB() { + public boolean hasTotalStaticBloomSize() { return ((bitField0_ & 0x00002000) == 0x00002000); } /** - * optional uint32 total_static_bloom_size_KB = 14; + * optional uint64 total_static_bloom_size = 14; * *
        **
@@ -5829,11 +5829,11 @@ public final class ClusterStatusProtos {
        * block cache, in KB.
        * 
*/ - public int getTotalStaticBloomSizeKB() { - return totalStaticBloomSizeKB_; + public long getTotalStaticBloomSize() { + return totalStaticBloomSize_; } /** - * optional uint32 total_static_bloom_size_KB = 14; + * optional uint64 total_static_bloom_size = 14; * *
        **
@@ -5841,14 +5841,14 @@ public final class ClusterStatusProtos {
        * block cache, in KB.
        * 
*/ - public Builder setTotalStaticBloomSizeKB(int value) { + public Builder setTotalStaticBloomSize(long value) { bitField0_ |= 0x00002000; - totalStaticBloomSizeKB_ = value; + totalStaticBloomSize_ = value; onChanged(); return this; } /** - * optional uint32 total_static_bloom_size_KB = 14; + * optional uint64 total_static_bloom_size = 14; * *
        **
@@ -5856,9 +5856,9 @@ public final class ClusterStatusProtos {
        * block cache, in KB.
        * 
*/ - public Builder clearTotalStaticBloomSizeKB() { + public Builder clearTotalStaticBloomSize() { bitField0_ = (bitField0_ & ~0x00002000); - totalStaticBloomSizeKB_ = 0; + totalStaticBloomSize_ = 0L; onChanged(); return this; } @@ -14722,49 +14722,48 @@ public final class ClusterStatusProtos { "\014\022\023\n\013sequence_id\030\002 \002(\004\"g\n\026RegionStoreSeq" + "uenceIds\022 \n\030last_flushed_sequence_id\030\001 \002" + "(\004\022+\n\021store_sequence_id\030\002 \003(\0132\020.StoreSeq" + - "uenceId\"\302\004\n\nRegionLoad\022*\n\020region_specifi" + + "uenceId\"\263\004\n\nRegionLoad\022*\n\020region_specifi" + "er\030\001 \002(\0132\020.RegionSpecifier\022\016\n\006stores\030\002 \001" + - "(\r\022\022\n\nstorefiles\030\003 \001(\r\022\"\n\032store_uncompre" + - "ssed_size_MB\030\004 \001(\r\022\031\n\021storefile_size_MB\030", - "\005 \001(\r\022\030\n\020memstore_size_MB\030\006 \001(\r\022\037\n\027store" + - "file_index_size_MB\030\007 \001(\r\022\033\n\023read_request" + - "s_count\030\010 \001(\004\022\034\n\024write_requests_count\030\t " + - "\001(\004\022\034\n\024total_compacting_KVs\030\n \001(\004\022\035\n\025cur" + - "rent_compacted_KVs\030\013 \001(\004\022\032\n\022root_index_s" + - "ize_KB\030\014 \001(\r\022\"\n\032total_static_index_size_" + - "KB\030\r \001(\r\022\"\n\032total_static_bloom_size_KB\030\016" + - " \001(\r\022\034\n\024complete_sequence_id\030\017 \001(\004\022\025\n\rda" + - "ta_locality\030\020 \001(\002\022#\n\030last_major_compacti" + - "on_ts\030\021 \001(\004:\0010\0224\n\032store_complete_sequenc", - "e_id\030\022 \003(\0132\020.StoreSequenceId\"T\n\023Replicat" + - "ionLoadSink\022\032\n\022ageOfLastAppliedOp\030\001 \002(\004\022" + - "!\n\031timeStampsOfLastAppliedOp\030\002 \002(\004\"\225\001\n\025R" + - "eplicationLoadSource\022\016\n\006peerID\030\001 \002(\t\022\032\n\022" + - "ageOfLastShippedOp\030\002 \002(\004\022\026\n\016sizeOfLogQue" + - "ue\030\003 \002(\r\022 \n\030timeStampOfLastShippedOp\030\004 \002" + - "(\004\022\026\n\016replicationLag\030\005 \002(\004\"\346\002\n\nServerLoa" + - "d\022\032\n\022number_of_requests\030\001 \001(\r\022 \n\030total_n" + - "umber_of_requests\030\002 \001(\r\022\024\n\014used_heap_MB\030" + - "\003 \001(\r\022\023\n\013max_heap_MB\030\004 \001(\r\022!\n\014region_loa", - "ds\030\005 \003(\0132\013.RegionLoad\022\"\n\014coprocessors\030\006 " + - "\003(\0132\014.Coprocessor\022\031\n\021report_start_time\030\007" + - " \001(\004\022\027\n\017report_end_time\030\010 \001(\004\022\030\n\020info_se" + - "rver_port\030\t \001(\r\022.\n\016replLoadSource\030\n \003(\0132" + - "\026.ReplicationLoadSource\022*\n\014replLoadSink\030" + - "\013 \001(\0132\024.ReplicationLoadSink\"O\n\016LiveServe" + - "rInfo\022\033\n\006server\030\001 \002(\0132\013.ServerName\022 \n\013se" + - "rver_load\030\002 \002(\0132\013.ServerLoad\"\340\002\n\rCluster" + - "Status\022/\n\rhbase_version\030\001 \001(\0132\030.HBaseVer" + - "sionFileContent\022%\n\014live_servers\030\002 \003(\0132\017.", - "LiveServerInfo\022!\n\014dead_servers\030\003 \003(\0132\013.S" + - "erverName\0222\n\025regions_in_transition\030\004 \003(\013" + - "2\023.RegionInTransition\022\036\n\ncluster_id\030\005 \001(" + - "\0132\n.ClusterId\022)\n\023master_coprocessors\030\006 \003" + - "(\0132\014.Coprocessor\022\033\n\006master\030\007 \001(\0132\013.Serve" + - "rName\022#\n\016backup_masters\030\010 \003(\0132\013.ServerNa" + - "me\022\023\n\013balancer_on\030\t \001(\010BF\n*org.apache.ha" + - "doop.hbase.protobuf.generatedB\023ClusterSt" + - "atusProtosH\001\240\001\001" + "(\r\022\022\n\nstorefiles\030\003 \001(\r\022\037\n\027store_uncompre" + + "ssed_size\030\004 \001(\004\022\026\n\016storefile_size\030\005 \001(\004\022", + "\030\n\020memstore_size_MB\030\006 \001(\r\022\037\n\027storefile_i" + + "ndex_size_MB\030\007 \001(\r\022\033\n\023read_requests_coun" + + "t\030\010 \001(\004\022\034\n\024write_requests_count\030\t \001(\004\022\034\n" + + "\024total_compacting_KVs\030\n \001(\004\022\035\n\025current_c" + + "ompacted_KVs\030\013 \001(\004\022\027\n\017root_index_size\030\014 " + + "\001(\004\022\037\n\027total_static_index_size\030\r \001(\004\022\037\n\027" + + "total_static_bloom_size\030\016 \001(\004\022\034\n\024complet" + + "e_sequence_id\030\017 \001(\004\022\025\n\rdata_locality\030\020 \001" + + "(\002\022#\n\030last_major_compaction_ts\030\021 \001(\004:\0010\022" + + "4\n\032store_complete_sequence_id\030\022 \003(\0132\020.St", + "oreSequenceId\"T\n\023ReplicationLoadSink\022\032\n\022" + + "ageOfLastAppliedOp\030\001 \002(\004\022!\n\031timeStampsOf" + + "LastAppliedOp\030\002 \002(\004\"\225\001\n\025ReplicationLoadS" + + "ource\022\016\n\006peerID\030\001 \002(\t\022\032\n\022ageOfLastShippe" + + "dOp\030\002 \002(\004\022\026\n\016sizeOfLogQueue\030\003 \002(\r\022 \n\030tim" + + "eStampOfLastShippedOp\030\004 \002(\004\022\026\n\016replicati" + + "onLag\030\005 \002(\004\"\346\002\n\nServerLoad\022\032\n\022number_of_" + + "requests\030\001 \001(\r\022 \n\030total_number_of_reques" + + "ts\030\002 \001(\r\022\024\n\014used_heap_MB\030\003 \001(\r\022\023\n\013max_he" + + "ap_MB\030\004 \001(\r\022!\n\014region_loads\030\005 \003(\0132\013.Regi", + "onLoad\022\"\n\014coprocessors\030\006 \003(\0132\014.Coprocess" + + "or\022\031\n\021report_start_time\030\007 \001(\004\022\027\n\017report_" + + "end_time\030\010 \001(\004\022\030\n\020info_server_port\030\t \001(\r" + + "\022.\n\016replLoadSource\030\n \003(\0132\026.ReplicationLo" + + "adSource\022*\n\014replLoadSink\030\013 \001(\0132\024.Replica" + + "tionLoadSink\"O\n\016LiveServerInfo\022\033\n\006server" + + "\030\001 \002(\0132\013.ServerName\022 \n\013server_load\030\002 \002(\013" + + "2\013.ServerLoad\"\340\002\n\rClusterStatus\022/\n\rhbase" + + "_version\030\001 \001(\0132\030.HBaseVersionFileContent" + + "\022%\n\014live_servers\030\002 \003(\0132\017.LiveServerInfo\022", + "!\n\014dead_servers\030\003 \003(\0132\013.ServerName\0222\n\025re" + + "gions_in_transition\030\004 \003(\0132\023.RegionInTran" + + "sition\022\036\n\ncluster_id\030\005 \001(\0132\n.ClusterId\022)" + + "\n\023master_coprocessors\030\006 \003(\0132\014.Coprocesso" + + "r\022\033\n\006master\030\007 \001(\0132\013.ServerName\022#\n\016backup" + + "_masters\030\010 \003(\0132\013.ServerName\022\023\n\013balancer_" + + "on\030\t \001(\010BF\n*org.apache.hadoop.hbase.prot" + + "obuf.generatedB\023ClusterStatusProtosH\001\240\001\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -14800,7 +14799,7 @@ public final class ClusterStatusProtos { internal_static_RegionLoad_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_RegionLoad_descriptor, - new java.lang.String[] { "RegionSpecifier", "Stores", "Storefiles", "StoreUncompressedSizeMB", "StorefileSizeMB", "MemstoreSizeMB", "StorefileIndexSizeMB", "ReadRequestsCount", "WriteRequestsCount", "TotalCompactingKVs", "CurrentCompactedKVs", "RootIndexSizeKB", "TotalStaticIndexSizeKB", "TotalStaticBloomSizeKB", "CompleteSequenceId", "DataLocality", "LastMajorCompactionTs", "StoreCompleteSequenceId", }); + new java.lang.String[] { "RegionSpecifier", "Stores", "Storefiles", "StoreUncompressedSize", "StorefileSize", "MemstoreSizeMB", "StorefileIndexSizeMB", "ReadRequestsCount", "WriteRequestsCount", "TotalCompactingKVs", "CurrentCompactedKVs", "RootIndexSize", "TotalStaticIndexSize", "TotalStaticBloomSize", "CompleteSequenceId", "DataLocality", "LastMajorCompactionTs", "StoreCompleteSequenceId", }); internal_static_ReplicationLoadSink_descriptor = getDescriptor().getMessageTypes().get(5); internal_static_ReplicationLoadSink_fieldAccessorTable = new diff --git a/hbase-protocol/src/main/protobuf/ClusterStatus.proto b/hbase-protocol/src/main/protobuf/ClusterStatus.proto index 305e08a..c1ee9cc 100644 --- a/hbase-protocol/src/main/protobuf/ClusterStatus.proto +++ b/hbase-protocol/src/main/protobuf/ClusterStatus.proto @@ -86,11 +86,11 @@ message RegionLoad { /** the number of storefiles for the region */ optional uint32 storefiles = 3; - /** the total size of the store files for the region, uncompressed, in MB */ - optional uint32 store_uncompressed_size_MB = 4; + /** the total size of the store files for the region, uncompressed */ + optional uint64 store_uncompressed_size = 4; - /** the current total size of the store files for the region, in MB */ - optional uint32 storefile_size_MB = 5; + /** the current total size of the store files for the region */ + optional uint64 storefile_size = 5; /** the current size of the memstore for the region, in MB */ optional uint32 memstore_size_MB = 6; @@ -113,17 +113,17 @@ message RegionLoad { /** the completed count of key values in currently running compaction */ optional uint64 current_compacted_KVs = 11; - /** The current total size of root-level indexes for the region, in KB. */ - optional uint32 root_index_size_KB = 12; + /** The current total size of root-level indexes for the region. */ + optional uint64 root_index_size = 12; - /** The total size of all index blocks, not just the root level, in KB. */ - optional uint32 total_static_index_size_KB = 13; + /** The total size of all index blocks, not just the root level. */ + optional uint64 total_static_index_size = 13; /** * The total size of all Bloom filter blocks, not just loaded into the - * block cache, in KB. + * block cache. */ - optional uint32 total_static_bloom_size_KB = 14; + optional uint64 total_static_bloom_size = 14; /** the most recent sequence Id from cache flush */ optional uint64 complete_sequence_id = 15; diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/StorageClusterStatusResource.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/StorageClusterStatusResource.java index a7e52bd..02bbcf8 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/StorageClusterStatusResource.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/StorageClusterStatusResource.java @@ -84,11 +84,11 @@ public class StorageClusterStatusResource extends ResourceBase { node.setRequests(load.getNumberOfRequests()); for (RegionLoad region: load.getRegionsLoad().values()) { node.addRegion(region.getName(), region.getStores(), - region.getStorefiles(), region.getStorefileSizeMB(), + region.getStorefiles(), region.getStorefileSize(), region.getMemStoreSizeMB(), region.getStorefileIndexSizeMB(), region.getReadRequestsCount(), region.getWriteRequestsCount(), - region.getRootIndexSizeKB(), region.getTotalStaticIndexSizeKB(), - region.getTotalStaticBloomSizeKB(), region.getTotalCompactingKVs(), + region.getRootIndexSize(), region.getTotalStaticIndexSize(), + region.getTotalStaticBloomSize(), region.getTotalCompactingKVs(), region.getCurrentCompactedKVs()); } } diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java index 2caec66..efa596a 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java @@ -46,7 +46,7 @@ import org.apache.hadoop.hbase.util.Bytes; *
  • liveNodes: detailed status of the live region servers
  • *
  • deadNodes: the names of region servers declared dead
  • * - * + * *
      * <complexType name="StorageClusterStatus">
      *   <sequence>
    @@ -64,7 +64,7 @@ import org.apache.hadoop.hbase.util.Bytes;
      *
      * <complexType name="Node">
      *   <sequence>
    - *     <element name="region" type="tns:Region" 
    + *     <element name="region" type="tns:Region"
      *       maxOccurs="unbounded" minOccurs="0"></element>
      *   </sequence>
      *   <attribute name="name" type="string"></attribute>
    @@ -78,14 +78,14 @@ import org.apache.hadoop.hbase.util.Bytes;
      *   <attribute name="name" type="base64Binary"></attribute>
      *   <attribute name="stores" type="int"></attribute>
      *   <attribute name="storefiles" type="int"></attribute>
    - *   <attribute name="storefileSizeMB" type="int"></attribute>
    + *   <attribute name="storefileSize" type="int"></attribute>
      *   <attribute name="memstoreSizeMB" type="int"></attribute>
      *   <attribute name="storefileIndexSizeMB" type="int"></attribute>
      *   <attribute name="readRequestsCount" type="int"></attribute>
      *   <attribute name="writeRequestsCount" type="int"></attribute>
    - *   <attribute name="rootIndexSizeKB" type="int"></attribute>
    - *   <attribute name="totalStaticIndexSizeKB" type="int"></attribute>
    - *   <attribute name="totalStaticBloomSizeKB" type="int"></attribute>
    + *   <attribute name="rootIndexSize" type="int"></attribute>
    + *   <attribute name="totalStaticIndexSize" type="int"></attribute>
    + *   <attribute name="totalStaticBloomSize" type="int"></attribute>
      *   <attribute name="totalCompactingKVs" type="int"></attribute>
      *   <attribute name="currentCompactedKVs" type="int"></attribute>
      * </complexType>
    @@ -93,7 +93,7 @@ import org.apache.hadoop.hbase.util.Bytes;
      */
     @XmlRootElement(name="ClusterStatus")
     @InterfaceAudience.Private
    -public class StorageClusterStatusModel 
    +public class StorageClusterStatusModel
         implements Serializable, ProtobufMessageHandler {
       private static final long serialVersionUID = 1L;
     
    @@ -112,14 +112,14 @@ public class StorageClusterStatusModel
           private byte[] name;
           private int stores;
           private int storefiles;
    -      private int storefileSizeMB;
    +      private long storefileSize;
           private int memstoreSizeMB;
           private int storefileIndexSizeMB;
           private long readRequestsCount;
           private long writeRequestsCount;
    -      private int rootIndexSizeKB;
    -      private int totalStaticIndexSizeKB;
    -      private int totalStaticBloomSizeKB;
    +      private long rootIndexSize;
    +      private long totalStaticIndexSize;
    +      private long totalStaticBloomSize;
           private long totalCompactingKVs;
           private long currentCompactedKVs;
     
    @@ -142,26 +142,26 @@ public class StorageClusterStatusModel
            * @param name the region name
            * @param stores the number of stores
            * @param storefiles the number of store files
    -       * @param storefileSizeMB total size of store files, in MB
    +       * @param storefileSize total size of store files, in MB
            * @param memstoreSizeMB total size of memstore, in MB
            * @param storefileIndexSizeMB total size of store file indexes, in MB
            */
           public Region(byte[] name, int stores, int storefiles,
    -          int storefileSizeMB, int memstoreSizeMB, int storefileIndexSizeMB,
    -          long readRequestsCount, long writeRequestsCount, int rootIndexSizeKB,
    -          int totalStaticIndexSizeKB, int totalStaticBloomSizeKB,
    +          long storefileSize, int memstoreSizeMB, int storefileIndexSizeMB,
    +          long readRequestsCount, long writeRequestsCount, long rootIndexSize,
    +          long totalStaticIndexSize, long totalStaticBloomSize,
               long totalCompactingKVs, long currentCompactedKVs) {
             this.name = name;
             this.stores = stores;
             this.storefiles = storefiles;
    -        this.storefileSizeMB = storefileSizeMB;
    +        this.storefileSize = storefileSize;
             this.memstoreSizeMB = memstoreSizeMB;
             this.storefileIndexSizeMB = storefileIndexSizeMB;
             this.readRequestsCount = readRequestsCount;
             this.writeRequestsCount = writeRequestsCount;
    -        this.rootIndexSizeKB = rootIndexSizeKB;
    -        this.totalStaticIndexSizeKB = totalStaticIndexSizeKB;
    -        this.totalStaticBloomSizeKB = totalStaticBloomSizeKB;
    +        this.rootIndexSize = rootIndexSize;
    +        this.totalStaticIndexSize = totalStaticIndexSize;
    +        this.totalStaticBloomSize = totalStaticBloomSize;
             this.totalCompactingKVs = totalCompactingKVs;
             this.currentCompactedKVs = currentCompactedKVs;
           }
    @@ -183,7 +183,7 @@ public class StorageClusterStatusModel
           }
     
           /**
    -       * @return the number of store files 
    +       * @return the number of store files
            */
           @XmlAttribute
           public int getStorefiles() {
    @@ -191,11 +191,11 @@ public class StorageClusterStatusModel
           }
     
           /**
    -       * @return the total size of store files, in MB
    +       * @return the total size of store files
            */
           @XmlAttribute
    -      public int getStorefileSizeMB() {
    -        return storefileSizeMB;
    +      public long getStorefileSize() {
    +        return storefileSize;
           }
     
           /**
    @@ -231,31 +231,31 @@ public class StorageClusterStatusModel
           }
     
           /**
    -       * @return The current total size of root-level indexes for the region, in KB.
    +       * @return The current total size of root-level indexes for the region.
            */
           @XmlAttribute
    -      public int getRootIndexSizeKB() {
    -        return rootIndexSizeKB;
    +      public long getRootIndexSize() {
    +        return rootIndexSize;
           }
     
           /**
    -       * @return The total size of static index, in KB
    +       * @return The total size of static index
            */
           @XmlAttribute
    -      public int getTotalStaticIndexSizeKB() {
    -        return totalStaticIndexSizeKB;
    +      public long getTotalStaticIndexSize() {
    +        return totalStaticIndexSize;
           }
     
           /**
    -       * @return The total size of static bloom, in KB
    +       * @return The total size of static bloom
            */
           @XmlAttribute
    -      public int getTotalStaticBloomSizeKB() {
    -        return totalStaticBloomSizeKB;
    +      public long getTotalStaticBloomSize() {
    +        return totalStaticBloomSize;
           }
     
           /**
    -       * @return The total number of compacting key-values 
    +       * @return The total number of compacting key-values
            */
           @XmlAttribute
           public long getTotalCompactingKVs() {
    @@ -278,11 +278,11 @@ public class StorageClusterStatusModel
           }
     
           /**
    -       * @param rootIndexSizeKB The current total size of root-level indexes
    -       *                        for the region, in KB
    +       * @param rootIndexSize The current total size of root-level indexes
    +       *                        for the region
            */
    -      public void setRootIndexSizeKB(int rootIndexSizeKB) {
    -        this.rootIndexSizeKB = rootIndexSizeKB;
    +      public void setRootIndexSize(long rootIndexSize) {
    +        this.rootIndexSize = rootIndexSize;
           }
     
           /**
    @@ -309,19 +309,19 @@ public class StorageClusterStatusModel
           }
     
           /**
    -       * @param totalStaticBloomSizeKB The total size of all Bloom filter blocks,
    -       *                               not just loaded into the block cache, in KB.
    +       * @param totalStaticBloomSize The total size of all Bloom filter blocks,
    +       *                               not just loaded into the block cache.
            */
    -      public void setTotalStaticBloomSizeKB(int totalStaticBloomSizeKB) {
    -        this.totalStaticBloomSizeKB = totalStaticBloomSizeKB;
    +      public void setTotalStaticBloomSize(long totalStaticBloomSize) {
    +        this.totalStaticBloomSize = totalStaticBloomSize;
           }
     
           /**
    -       * @param totalStaticIndexSizeKB The total size of all index blocks,
    +       * @param totalStaticIndexSize The total size of all index blocks,
            *                               not just the root level, in KB.
            */
    -      public void setTotalStaticIndexSizeKB(int totalStaticIndexSizeKB) {
    -        this.totalStaticIndexSizeKB = totalStaticIndexSizeKB;
    +      public void setTotalStaticIndexSize(long totalStaticIndexSize) {
    +        this.totalStaticIndexSize = totalStaticIndexSize;
           }
     
           /**
    @@ -346,10 +346,10 @@ public class StorageClusterStatusModel
           }
     
           /**
    -       * @param storefileSizeMB total size of store files, in MB
    +       * @param storefileSize total size of store files
            */
    -      public void setStorefileSizeMB(int storefileSizeMB) {
    -        this.storefileSizeMB = storefileSizeMB;
    +      public void setStorefileSize(long storefileSize) {
    +        this.storefileSize = storefileSize;
           }
     
           /**
    @@ -379,14 +379,14 @@ public class StorageClusterStatusModel
          * @param name the region name
          */
         public void addRegion(byte[] name, int stores, int storefiles,
    -        int storefileSizeMB, int memstoreSizeMB, int storefileIndexSizeMB,
    -        long readRequestsCount, long writeRequestsCount, int rootIndexSizeKB,
    -        int totalStaticIndexSizeKB, int totalStaticBloomSizeKB,
    -        long totalCompactingKVs, long currentCompactedKVs) { 
    -      regions.add(new Region(name, stores, storefiles, storefileSizeMB,
    +        long storefileSize, int memstoreSizeMB, int storefileIndexSizeMB,
    +        long readRequestsCount, long writeRequestsCount, long rootIndexSize,
    +        long totalStaticIndexSize, long totalStaticBloomSize,
    +        long totalCompactingKVs, long currentCompactedKVs) {
    +      regions.add(new Region(name, stores, storefiles, storefileSize,
             memstoreSizeMB, storefileIndexSizeMB, readRequestsCount,
    -        writeRequestsCount, rootIndexSizeKB, totalStaticIndexSizeKB,
    -        totalStaticBloomSizeKB, totalCompactingKVs, currentCompactedKVs));
    +        writeRequestsCount, rootIndexSize, totalStaticIndexSize,
    +        totalStaticBloomSize, totalCompactingKVs, currentCompactedKVs));
         }
     
         /**
    @@ -641,7 +641,7 @@ public class StorageClusterStatusModel
       @Override
       public String toString() {
         StringBuilder sb = new StringBuilder();
    -    sb.append(String.format("%d live servers, %d dead servers, " + 
    +    sb.append(String.format("%d live servers, %d dead servers, " +
           "%.4f average load%n%n", liveNodes.size(), deadNodes.size(),
           averageLoad));
         if (!liveNodes.isEmpty()) {
    @@ -668,8 +668,8 @@ public class StorageClusterStatusModel
               sb.append(region.stores);
               sb.append("\n            storefiless=");
               sb.append(region.storefiles);
    -          sb.append("\n            storefileSizeMB=");
    -          sb.append(region.storefileSizeMB);
    +          sb.append("\n            storefileSize=");
    +          sb.append(region.storefileSize);
               sb.append("\n            memstoreSizeMB=");
               sb.append(region.memstoreSizeMB);
               sb.append("\n            storefileIndexSizeMB=");
    @@ -678,12 +678,12 @@ public class StorageClusterStatusModel
               sb.append(region.readRequestsCount);
               sb.append("\n            writeRequestsCount=");
               sb.append(region.writeRequestsCount);
    -          sb.append("\n            rootIndexSizeKB=");
    -          sb.append(region.rootIndexSizeKB);
    -          sb.append("\n            totalStaticIndexSizeKB=");
    -          sb.append(region.totalStaticIndexSizeKB);
    -          sb.append("\n            totalStaticBloomSizeKB=");
    -          sb.append(region.totalStaticBloomSizeKB);
    +          sb.append("\n            rootIndexSize=");
    +          sb.append(region.rootIndexSize);
    +          sb.append("\n            totalStaticIndexSize=");
    +          sb.append(region.totalStaticIndexSize);
    +          sb.append("\n            totalStaticBloomSize=");
    +          sb.append(region.totalStaticBloomSize);
               sb.append("\n            totalCompactingKVs=");
               sb.append(region.totalCompactingKVs);
               sb.append("\n            currentCompactedKVs=");
    @@ -713,7 +713,7 @@ public class StorageClusterStatusModel
         builder.setRequests(requests);
         builder.setAverageLoad(averageLoad);
         for (Node node: liveNodes) {
    -      StorageClusterStatus.Node.Builder nodeBuilder = 
    +      StorageClusterStatus.Node.Builder nodeBuilder =
             StorageClusterStatus.Node.newBuilder();
           nodeBuilder.setName(node.name);
           nodeBuilder.setStartCode(node.startCode);
    @@ -726,14 +726,14 @@ public class StorageClusterStatusModel
             regionBuilder.setName(ByteStringer.wrap(region.name));
             regionBuilder.setStores(region.stores);
             regionBuilder.setStorefiles(region.storefiles);
    -        regionBuilder.setStorefileSizeMB(region.storefileSizeMB);
    +        regionBuilder.setStorefileSize(region.storefileSize);
             regionBuilder.setMemstoreSizeMB(region.memstoreSizeMB);
             regionBuilder.setStorefileIndexSizeMB(region.storefileIndexSizeMB);
             regionBuilder.setReadRequestsCount(region.readRequestsCount);
             regionBuilder.setWriteRequestsCount(region.writeRequestsCount);
    -        regionBuilder.setRootIndexSizeKB(region.rootIndexSizeKB);
    -        regionBuilder.setTotalStaticIndexSizeKB(region.totalStaticIndexSizeKB);
    -        regionBuilder.setTotalStaticBloomSizeKB(region.totalStaticBloomSizeKB);
    +        regionBuilder.setRootIndexSize(region.rootIndexSize);
    +        regionBuilder.setTotalStaticIndexSize(region.totalStaticIndexSize);
    +        regionBuilder.setTotalStaticBloomSize(region.totalStaticBloomSize);
             regionBuilder.setTotalCompactingKVs(region.totalCompactingKVs);
             regionBuilder.setCurrentCompactedKVs(region.currentCompactedKVs);
             nodeBuilder.addRegions(regionBuilder);
    @@ -762,7 +762,7 @@ public class StorageClusterStatusModel
         }
         for (StorageClusterStatus.Node node: builder.getLiveNodesList()) {
           long startCode = node.hasStartCode() ? node.getStartCode() : -1;
    -      StorageClusterStatusModel.Node nodeModel = 
    +      StorageClusterStatusModel.Node nodeModel =
             addLiveNode(node.getName(), startCode, node.getHeapSizeMB(),
               node.getMaxHeapSizeMB());
           int requests = node.hasRequests() ? node.getRequests() : 0;
    @@ -772,14 +772,14 @@ public class StorageClusterStatusModel
               region.getName().toByteArray(),
               region.getStores(),
               region.getStorefiles(),
    -          region.getStorefileSizeMB(),
    +          region.getStorefileSize(),
               region.getMemstoreSizeMB(),
               region.getStorefileIndexSizeMB(),
               region.getReadRequestsCount(),
               region.getWriteRequestsCount(),
    -          region.getRootIndexSizeKB(),
    -          region.getTotalStaticIndexSizeKB(),
    -          region.getTotalStaticBloomSizeKB(),
    +          region.getRootIndexSize(),
    +          region.getTotalStaticIndexSize(),
    +          region.getTotalStaticBloomSize(),
               region.getTotalCompactingKVs(),
               region.getCurrentCompactedKVs());
           }
    diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/StorageClusterStatusMessage.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/StorageClusterStatusMessage.java
    index 05ff7a3..3259bcd 100644
    --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/StorageClusterStatusMessage.java
    +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/StorageClusterStatusMessage.java
    @@ -274,15 +274,15 @@ public final class StorageClusterStatusMessage {
            */
           int getStorefiles();
     
    -      // optional int32 storefileSizeMB = 4;
    +      // optional int64 storefileSize = 4;
           /**
    -       * optional int32 storefileSizeMB = 4;
    +       * optional int64 storefileSize = 4;
            */
    -      boolean hasStorefileSizeMB();
    +      boolean hasStorefileSize();
           /**
    -       * optional int32 storefileSizeMB = 4;
    +       * optional int64 storefileSize = 4;
            */
    -      int getStorefileSizeMB();
    +      long getStorefileSize();
     
           // optional int32 memstoreSizeMB = 5;
           /**
    @@ -324,35 +324,35 @@ public final class StorageClusterStatusMessage {
            */
           long getWriteRequestsCount();
     
    -      // optional int32 rootIndexSizeKB = 9;
    +      // optional int64 rootIndexSize = 9;
           /**
    -       * optional int32 rootIndexSizeKB = 9;
    +       * optional int64 rootIndexSize = 9;
            */
    -      boolean hasRootIndexSizeKB();
    +      boolean hasRootIndexSize();
           /**
    -       * optional int32 rootIndexSizeKB = 9;
    +       * optional int64 rootIndexSize = 9;
            */
    -      int getRootIndexSizeKB();
    +      long getRootIndexSize();
     
    -      // optional int32 totalStaticIndexSizeKB = 10;
    +      // optional int64 totalStaticIndexSize = 10;
           /**
    -       * optional int32 totalStaticIndexSizeKB = 10;
    +       * optional int64 totalStaticIndexSize = 10;
            */
    -      boolean hasTotalStaticIndexSizeKB();
    +      boolean hasTotalStaticIndexSize();
           /**
    -       * optional int32 totalStaticIndexSizeKB = 10;
    +       * optional int64 totalStaticIndexSize = 10;
            */
    -      int getTotalStaticIndexSizeKB();
    +      long getTotalStaticIndexSize();
     
    -      // optional int32 totalStaticBloomSizeKB = 11;
    +      // optional int64 totalStaticBloomSize = 11;
           /**
    -       * optional int32 totalStaticBloomSizeKB = 11;
    +       * optional int64 totalStaticBloomSize = 11;
            */
    -      boolean hasTotalStaticBloomSizeKB();
    +      boolean hasTotalStaticBloomSize();
           /**
    -       * optional int32 totalStaticBloomSizeKB = 11;
    +       * optional int64 totalStaticBloomSize = 11;
            */
    -      int getTotalStaticBloomSizeKB();
    +      long getTotalStaticBloomSize();
     
           // optional int64 totalCompactingKVs = 12;
           /**
    @@ -442,7 +442,7 @@ public final class StorageClusterStatusMessage {
                   }
                   case 32: {
                     bitField0_ |= 0x00000008;
    -                storefileSizeMB_ = input.readInt32();
    +                storefileSize_ = input.readInt64();
                     break;
                   }
                   case 40: {
    @@ -467,17 +467,17 @@ public final class StorageClusterStatusMessage {
                   }
                   case 72: {
                     bitField0_ |= 0x00000100;
    -                rootIndexSizeKB_ = input.readInt32();
    +                rootIndexSize_ = input.readInt64();
                     break;
                   }
                   case 80: {
                     bitField0_ |= 0x00000200;
    -                totalStaticIndexSizeKB_ = input.readInt32();
    +                totalStaticIndexSize_ = input.readInt64();
                     break;
                   }
                   case 88: {
                     bitField0_ |= 0x00000400;
    -                totalStaticBloomSizeKB_ = input.readInt32();
    +                totalStaticBloomSize_ = input.readInt64();
                     break;
                   }
                   case 96: {
    @@ -578,20 +578,20 @@ public final class StorageClusterStatusMessage {
             return storefiles_;
           }
     
    -      // optional int32 storefileSizeMB = 4;
    -      public static final int STOREFILESIZEMB_FIELD_NUMBER = 4;
    -      private int storefileSizeMB_;
    +      // optional int64 storefileSize = 4;
    +      public static final int STOREFILESIZE_FIELD_NUMBER = 4;
    +      private long storefileSize_;
           /**
    -       * optional int32 storefileSizeMB = 4;
    +       * optional int64 storefileSize = 4;
            */
    -      public boolean hasStorefileSizeMB() {
    +      public boolean hasStorefileSize() {
             return ((bitField0_ & 0x00000008) == 0x00000008);
           }
           /**
    -       * optional int32 storefileSizeMB = 4;
    +       * optional int64 storefileSize = 4;
            */
    -      public int getStorefileSizeMB() {
    -        return storefileSizeMB_;
    +      public long getStorefileSize() {
    +        return storefileSize_;
           }
     
           // optional int32 memstoreSizeMB = 5;
    @@ -658,52 +658,52 @@ public final class StorageClusterStatusMessage {
             return writeRequestsCount_;
           }
     
    -      // optional int32 rootIndexSizeKB = 9;
    -      public static final int ROOTINDEXSIZEKB_FIELD_NUMBER = 9;
    -      private int rootIndexSizeKB_;
    +      // optional int64 rootIndexSize = 9;
    +      public static final int ROOTINDEXSIZE_FIELD_NUMBER = 9;
    +      private long rootIndexSize_;
           /**
    -       * optional int32 rootIndexSizeKB = 9;
    +       * optional int64 rootIndexSize = 9;
            */
    -      public boolean hasRootIndexSizeKB() {
    +      public boolean hasRootIndexSize() {
             return ((bitField0_ & 0x00000100) == 0x00000100);
           }
           /**
    -       * optional int32 rootIndexSizeKB = 9;
    +       * optional int64 rootIndexSize = 9;
            */
    -      public int getRootIndexSizeKB() {
    -        return rootIndexSizeKB_;
    +      public long getRootIndexSize() {
    +        return rootIndexSize_;
           }
     
    -      // optional int32 totalStaticIndexSizeKB = 10;
    -      public static final int TOTALSTATICINDEXSIZEKB_FIELD_NUMBER = 10;
    -      private int totalStaticIndexSizeKB_;
    +      // optional int64 totalStaticIndexSize = 10;
    +      public static final int TOTALSTATICINDEXSIZE_FIELD_NUMBER = 10;
    +      private long totalStaticIndexSize_;
           /**
    -       * optional int32 totalStaticIndexSizeKB = 10;
    +       * optional int64 totalStaticIndexSize = 10;
            */
    -      public boolean hasTotalStaticIndexSizeKB() {
    +      public boolean hasTotalStaticIndexSize() {
             return ((bitField0_ & 0x00000200) == 0x00000200);
           }
           /**
    -       * optional int32 totalStaticIndexSizeKB = 10;
    +       * optional int64 totalStaticIndexSize = 10;
            */
    -      public int getTotalStaticIndexSizeKB() {
    -        return totalStaticIndexSizeKB_;
    +      public long getTotalStaticIndexSize() {
    +        return totalStaticIndexSize_;
           }
     
    -      // optional int32 totalStaticBloomSizeKB = 11;
    -      public static final int TOTALSTATICBLOOMSIZEKB_FIELD_NUMBER = 11;
    -      private int totalStaticBloomSizeKB_;
    +      // optional int64 totalStaticBloomSize = 11;
    +      public static final int TOTALSTATICBLOOMSIZE_FIELD_NUMBER = 11;
    +      private long totalStaticBloomSize_;
           /**
    -       * optional int32 totalStaticBloomSizeKB = 11;
    +       * optional int64 totalStaticBloomSize = 11;
            */
    -      public boolean hasTotalStaticBloomSizeKB() {
    +      public boolean hasTotalStaticBloomSize() {
             return ((bitField0_ & 0x00000400) == 0x00000400);
           }
           /**
    -       * optional int32 totalStaticBloomSizeKB = 11;
    +       * optional int64 totalStaticBloomSize = 11;
            */
    -      public int getTotalStaticBloomSizeKB() {
    -        return totalStaticBloomSizeKB_;
    +      public long getTotalStaticBloomSize() {
    +        return totalStaticBloomSize_;
           }
     
           // optional int64 totalCompactingKVs = 12;
    @@ -742,14 +742,14 @@ public final class StorageClusterStatusMessage {
             name_ = com.google.protobuf.ByteString.EMPTY;
             stores_ = 0;
             storefiles_ = 0;
    -        storefileSizeMB_ = 0;
    +        storefileSize_ = 0L;
             memstoreSizeMB_ = 0;
             storefileIndexSizeMB_ = 0;
             readRequestsCount_ = 0L;
             writeRequestsCount_ = 0L;
    -        rootIndexSizeKB_ = 0;
    -        totalStaticIndexSizeKB_ = 0;
    -        totalStaticBloomSizeKB_ = 0;
    +        rootIndexSize_ = 0L;
    +        totalStaticIndexSize_ = 0L;
    +        totalStaticBloomSize_ = 0L;
             totalCompactingKVs_ = 0L;
             currentCompactedKVs_ = 0L;
           }
    @@ -779,7 +779,7 @@ public final class StorageClusterStatusMessage {
               output.writeInt32(3, storefiles_);
             }
             if (((bitField0_ & 0x00000008) == 0x00000008)) {
    -          output.writeInt32(4, storefileSizeMB_);
    +          output.writeInt64(4, storefileSize_);
             }
             if (((bitField0_ & 0x00000010) == 0x00000010)) {
               output.writeInt32(5, memstoreSizeMB_);
    @@ -794,13 +794,13 @@ public final class StorageClusterStatusMessage {
               output.writeInt64(8, writeRequestsCount_);
             }
             if (((bitField0_ & 0x00000100) == 0x00000100)) {
    -          output.writeInt32(9, rootIndexSizeKB_);
    +          output.writeInt64(9, rootIndexSize_);
             }
             if (((bitField0_ & 0x00000200) == 0x00000200)) {
    -          output.writeInt32(10, totalStaticIndexSizeKB_);
    +          output.writeInt64(10, totalStaticIndexSize_);
             }
             if (((bitField0_ & 0x00000400) == 0x00000400)) {
    -          output.writeInt32(11, totalStaticBloomSizeKB_);
    +          output.writeInt64(11, totalStaticBloomSize_);
             }
             if (((bitField0_ & 0x00000800) == 0x00000800)) {
               output.writeInt64(12, totalCompactingKVs_);
    @@ -831,7 +831,7 @@ public final class StorageClusterStatusMessage {
             }
             if (((bitField0_ & 0x00000008) == 0x00000008)) {
               size += com.google.protobuf.CodedOutputStream
    -            .computeInt32Size(4, storefileSizeMB_);
    +            .computeInt64Size(4, storefileSize_);
             }
             if (((bitField0_ & 0x00000010) == 0x00000010)) {
               size += com.google.protobuf.CodedOutputStream
    @@ -851,15 +851,15 @@ public final class StorageClusterStatusMessage {
             }
             if (((bitField0_ & 0x00000100) == 0x00000100)) {
               size += com.google.protobuf.CodedOutputStream
    -            .computeInt32Size(9, rootIndexSizeKB_);
    +            .computeInt64Size(9, rootIndexSize_);
             }
             if (((bitField0_ & 0x00000200) == 0x00000200)) {
               size += com.google.protobuf.CodedOutputStream
    -            .computeInt32Size(10, totalStaticIndexSizeKB_);
    +            .computeInt64Size(10, totalStaticIndexSize_);
             }
             if (((bitField0_ & 0x00000400) == 0x00000400)) {
               size += com.google.protobuf.CodedOutputStream
    -            .computeInt32Size(11, totalStaticBloomSizeKB_);
    +            .computeInt64Size(11, totalStaticBloomSize_);
             }
             if (((bitField0_ & 0x00000800) == 0x00000800)) {
               size += com.google.protobuf.CodedOutputStream
    @@ -991,7 +991,7 @@ public final class StorageClusterStatusMessage {
               bitField0_ = (bitField0_ & ~0x00000002);
               storefiles_ = 0;
               bitField0_ = (bitField0_ & ~0x00000004);
    -          storefileSizeMB_ = 0;
    +          storefileSize_ = 0L;
               bitField0_ = (bitField0_ & ~0x00000008);
               memstoreSizeMB_ = 0;
               bitField0_ = (bitField0_ & ~0x00000010);
    @@ -1001,11 +1001,11 @@ public final class StorageClusterStatusMessage {
               bitField0_ = (bitField0_ & ~0x00000040);
               writeRequestsCount_ = 0L;
               bitField0_ = (bitField0_ & ~0x00000080);
    -          rootIndexSizeKB_ = 0;
    +          rootIndexSize_ = 0L;
               bitField0_ = (bitField0_ & ~0x00000100);
    -          totalStaticIndexSizeKB_ = 0;
    +          totalStaticIndexSize_ = 0L;
               bitField0_ = (bitField0_ & ~0x00000200);
    -          totalStaticBloomSizeKB_ = 0;
    +          totalStaticBloomSize_ = 0L;
               bitField0_ = (bitField0_ & ~0x00000400);
               totalCompactingKVs_ = 0L;
               bitField0_ = (bitField0_ & ~0x00000800);
    @@ -1054,7 +1054,7 @@ public final class StorageClusterStatusMessage {
               if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
                 to_bitField0_ |= 0x00000008;
               }
    -          result.storefileSizeMB_ = storefileSizeMB_;
    +          result.storefileSize_ = storefileSize_;
               if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
                 to_bitField0_ |= 0x00000010;
               }
    @@ -1074,15 +1074,15 @@ public final class StorageClusterStatusMessage {
               if (((from_bitField0_ & 0x00000100) == 0x00000100)) {
                 to_bitField0_ |= 0x00000100;
               }
    -          result.rootIndexSizeKB_ = rootIndexSizeKB_;
    +          result.rootIndexSize_ = rootIndexSize_;
               if (((from_bitField0_ & 0x00000200) == 0x00000200)) {
                 to_bitField0_ |= 0x00000200;
               }
    -          result.totalStaticIndexSizeKB_ = totalStaticIndexSizeKB_;
    +          result.totalStaticIndexSize_ = totalStaticIndexSize_;
               if (((from_bitField0_ & 0x00000400) == 0x00000400)) {
                 to_bitField0_ |= 0x00000400;
               }
    -          result.totalStaticBloomSizeKB_ = totalStaticBloomSizeKB_;
    +          result.totalStaticBloomSize_ = totalStaticBloomSize_;
               if (((from_bitField0_ & 0x00000800) == 0x00000800)) {
                 to_bitField0_ |= 0x00000800;
               }
    @@ -1116,8 +1116,8 @@ public final class StorageClusterStatusMessage {
               if (other.hasStorefiles()) {
                 setStorefiles(other.getStorefiles());
               }
    -          if (other.hasStorefileSizeMB()) {
    -            setStorefileSizeMB(other.getStorefileSizeMB());
    +          if (other.hasStorefileSize()) {
    +            setStorefileSize(other.getStorefileSize());
               }
               if (other.hasMemstoreSizeMB()) {
                 setMemstoreSizeMB(other.getMemstoreSizeMB());
    @@ -1131,14 +1131,14 @@ public final class StorageClusterStatusMessage {
               if (other.hasWriteRequestsCount()) {
                 setWriteRequestsCount(other.getWriteRequestsCount());
               }
    -          if (other.hasRootIndexSizeKB()) {
    -            setRootIndexSizeKB(other.getRootIndexSizeKB());
    +          if (other.hasRootIndexSize()) {
    +            setRootIndexSize(other.getRootIndexSize());
               }
    -          if (other.hasTotalStaticIndexSizeKB()) {
    -            setTotalStaticIndexSizeKB(other.getTotalStaticIndexSizeKB());
    +          if (other.hasTotalStaticIndexSize()) {
    +            setTotalStaticIndexSize(other.getTotalStaticIndexSize());
               }
    -          if (other.hasTotalStaticBloomSizeKB()) {
    -            setTotalStaticBloomSizeKB(other.getTotalStaticBloomSizeKB());
    +          if (other.hasTotalStaticBloomSize()) {
    +            setTotalStaticBloomSize(other.getTotalStaticBloomSize());
               }
               if (other.hasTotalCompactingKVs()) {
                 setTotalCompactingKVs(other.getTotalCompactingKVs());
    @@ -1279,35 +1279,35 @@ public final class StorageClusterStatusMessage {
               return this;
             }
     
    -        // optional int32 storefileSizeMB = 4;
    -        private int storefileSizeMB_ ;
    +        // optional int64 storefileSize = 4;
    +        private long storefileSize_ ;
             /**
    -         * optional int32 storefileSizeMB = 4;
    +         * optional int64 storefileSize = 4;
              */
    -        public boolean hasStorefileSizeMB() {
    +        public boolean hasStorefileSize() {
               return ((bitField0_ & 0x00000008) == 0x00000008);
             }
             /**
    -         * optional int32 storefileSizeMB = 4;
    +         * optional int64 storefileSize = 4;
              */
    -        public int getStorefileSizeMB() {
    -          return storefileSizeMB_;
    +        public long getStorefileSize() {
    +          return storefileSize_;
             }
             /**
    -         * optional int32 storefileSizeMB = 4;
    +         * optional int64 storefileSize = 4;
              */
    -        public Builder setStorefileSizeMB(int value) {
    +        public Builder setStorefileSize(long value) {
               bitField0_ |= 0x00000008;
    -          storefileSizeMB_ = value;
    +          storefileSize_ = value;
               onChanged();
               return this;
             }
             /**
    -         * optional int32 storefileSizeMB = 4;
    +         * optional int64 storefileSize = 4;
              */
    -        public Builder clearStorefileSizeMB() {
    +        public Builder clearStorefileSize() {
               bitField0_ = (bitField0_ & ~0x00000008);
    -          storefileSizeMB_ = 0;
    +          storefileSize_ = 0L;
               onChanged();
               return this;
             }
    @@ -1444,101 +1444,101 @@ public final class StorageClusterStatusMessage {
               return this;
             }
     
    -        // optional int32 rootIndexSizeKB = 9;
    -        private int rootIndexSizeKB_ ;
    +        // optional int64 rootIndexSize = 9;
    +        private long rootIndexSize_ ;
             /**
    -         * optional int32 rootIndexSizeKB = 9;
    +         * optional int64 rootIndexSize = 9;
              */
    -        public boolean hasRootIndexSizeKB() {
    +        public boolean hasRootIndexSize() {
               return ((bitField0_ & 0x00000100) == 0x00000100);
             }
             /**
    -         * optional int32 rootIndexSizeKB = 9;
    +         * optional int64 rootIndexSize = 9;
              */
    -        public int getRootIndexSizeKB() {
    -          return rootIndexSizeKB_;
    +        public long getRootIndexSize() {
    +          return rootIndexSize_;
             }
             /**
    -         * optional int32 rootIndexSizeKB = 9;
    +         * optional int64 rootIndexSize = 9;
              */
    -        public Builder setRootIndexSizeKB(int value) {
    +        public Builder setRootIndexSize(long value) {
               bitField0_ |= 0x00000100;
    -          rootIndexSizeKB_ = value;
    +          rootIndexSize_ = value;
               onChanged();
               return this;
             }
             /**
    -         * optional int32 rootIndexSizeKB = 9;
    +         * optional int64 rootIndexSize = 9;
              */
    -        public Builder clearRootIndexSizeKB() {
    +        public Builder clearRootIndexSize() {
               bitField0_ = (bitField0_ & ~0x00000100);
    -          rootIndexSizeKB_ = 0;
    +          rootIndexSize_ = 0L;
               onChanged();
               return this;
             }
     
    -        // optional int32 totalStaticIndexSizeKB = 10;
    -        private int totalStaticIndexSizeKB_ ;
    +        // optional int64 totalStaticIndexSize = 10;
    +        private long totalStaticIndexSize_ ;
             /**
    -         * optional int32 totalStaticIndexSizeKB = 10;
    +         * optional int64 totalStaticIndexSize = 10;
              */
    -        public boolean hasTotalStaticIndexSizeKB() {
    +        public boolean hasTotalStaticIndexSize() {
               return ((bitField0_ & 0x00000200) == 0x00000200);
             }
             /**
    -         * optional int32 totalStaticIndexSizeKB = 10;
    +         * optional int64 totalStaticIndexSize = 10;
              */
    -        public int getTotalStaticIndexSizeKB() {
    -          return totalStaticIndexSizeKB_;
    +        public long getTotalStaticIndexSize() {
    +          return totalStaticIndexSize_;
             }
             /**
    -         * optional int32 totalStaticIndexSizeKB = 10;
    +         * optional int64 totalStaticIndexSize = 10;
              */
    -        public Builder setTotalStaticIndexSizeKB(int value) {
    +        public Builder setTotalStaticIndexSize(long value) {
               bitField0_ |= 0x00000200;
    -          totalStaticIndexSizeKB_ = value;
    +          totalStaticIndexSize_ = value;
               onChanged();
               return this;
             }
             /**
    -         * optional int32 totalStaticIndexSizeKB = 10;
    +         * optional int64 totalStaticIndexSize = 10;
              */
    -        public Builder clearTotalStaticIndexSizeKB() {
    +        public Builder clearTotalStaticIndexSize() {
               bitField0_ = (bitField0_ & ~0x00000200);
    -          totalStaticIndexSizeKB_ = 0;
    +          totalStaticIndexSize_ = 0L;
               onChanged();
               return this;
             }
     
    -        // optional int32 totalStaticBloomSizeKB = 11;
    -        private int totalStaticBloomSizeKB_ ;
    +        // optional int64 totalStaticBloomSize = 11;
    +        private long totalStaticBloomSize_ ;
             /**
    -         * optional int32 totalStaticBloomSizeKB = 11;
    +         * optional int64 totalStaticBloomSize = 11;
              */
    -        public boolean hasTotalStaticBloomSizeKB() {
    +        public boolean hasTotalStaticBloomSize() {
               return ((bitField0_ & 0x00000400) == 0x00000400);
             }
             /**
    -         * optional int32 totalStaticBloomSizeKB = 11;
    +         * optional int64 totalStaticBloomSize = 11;
              */
    -        public int getTotalStaticBloomSizeKB() {
    -          return totalStaticBloomSizeKB_;
    +        public long getTotalStaticBloomSize() {
    +          return totalStaticBloomSize_;
             }
             /**
    -         * optional int32 totalStaticBloomSizeKB = 11;
    +         * optional int64 totalStaticBloomSize = 11;
              */
    -        public Builder setTotalStaticBloomSizeKB(int value) {
    +        public Builder setTotalStaticBloomSize(long value) {
               bitField0_ |= 0x00000400;
    -          totalStaticBloomSizeKB_ = value;
    +          totalStaticBloomSize_ = value;
               onChanged();
               return this;
             }
             /**
    -         * optional int32 totalStaticBloomSizeKB = 11;
    +         * optional int64 totalStaticBloomSize = 11;
              */
    -        public Builder clearTotalStaticBloomSizeKB() {
    +        public Builder clearTotalStaticBloomSize() {
               bitField0_ = (bitField0_ & ~0x00000400);
    -          totalStaticBloomSizeKB_ = 0;
    +          totalStaticBloomSize_ = 0L;
               onChanged();
               return this;
             }
    @@ -3899,25 +3899,25 @@ public final class StorageClusterStatusMessage {
         java.lang.String[] descriptorData = {
           "\n!StorageClusterStatusMessage.proto\022/org" +
           ".apache.hadoop.hbase.rest.protobuf.gener" +
    -      "ated\"\333\005\n\024StorageClusterStatus\022]\n\tliveNod" +
    +      "ated\"\323\005\n\024StorageClusterStatus\022]\n\tliveNod" +
           "es\030\001 \003(\0132J.org.apache.hadoop.hbase.rest." +
           "protobuf.generated.StorageClusterStatus." +
           "Node\022\021\n\tdeadNodes\030\002 \003(\t\022\017\n\007regions\030\003 \001(\005" +
           "\022\020\n\010requests\030\004 \001(\005\022\023\n\013averageLoad\030\005 \001(\001\032" +
    -      "\322\002\n\006Region\022\014\n\004name\030\001 \002(\014\022\016\n\006stores\030\002 \001(\005" +
    -      "\022\022\n\nstorefiles\030\003 \001(\005\022\027\n\017storefileSizeMB\030" +
    -      "\004 \001(\005\022\026\n\016memstoreSizeMB\030\005 \001(\005\022\034\n\024storefi",
    -      "leIndexSizeMB\030\006 \001(\005\022\031\n\021readRequestsCount" +
    -      "\030\007 \001(\003\022\032\n\022writeRequestsCount\030\010 \001(\003\022\027\n\017ro" +
    -      "otIndexSizeKB\030\t \001(\005\022\036\n\026totalStaticIndexS" +
    -      "izeKB\030\n \001(\005\022\036\n\026totalStaticBloomSizeKB\030\013 " +
    -      "\001(\005\022\032\n\022totalCompactingKVs\030\014 \001(\003\022\033\n\023curre" +
    -      "ntCompactedKVs\030\r \001(\003\032\303\001\n\004Node\022\014\n\004name\030\001 " +
    -      "\002(\t\022\021\n\tstartCode\030\002 \001(\003\022\020\n\010requests\030\003 \001(\005" +
    -      "\022\022\n\nheapSizeMB\030\004 \001(\005\022\025\n\rmaxHeapSizeMB\030\005 " +
    -      "\001(\005\022]\n\007regions\030\006 \003(\0132L.org.apache.hadoop" +
    -      ".hbase.rest.protobuf.generated.StorageCl",
    -      "usterStatus.Region"
    +      "\312\002\n\006Region\022\014\n\004name\030\001 \002(\014\022\016\n\006stores\030\002 \001(\005" +
    +      "\022\022\n\nstorefiles\030\003 \001(\005\022\025\n\rstorefileSize\030\004 " +
    +      "\001(\003\022\026\n\016memstoreSizeMB\030\005 \001(\005\022\034\n\024storefile",
    +      "IndexSizeMB\030\006 \001(\005\022\031\n\021readRequestsCount\030\007" +
    +      " \001(\003\022\032\n\022writeRequestsCount\030\010 \001(\003\022\025\n\rroot" +
    +      "IndexSize\030\t \001(\003\022\034\n\024totalStaticIndexSize\030" +
    +      "\n \001(\003\022\034\n\024totalStaticBloomSize\030\013 \001(\003\022\032\n\022t" +
    +      "otalCompactingKVs\030\014 \001(\003\022\033\n\023currentCompac" +
    +      "tedKVs\030\r \001(\003\032\303\001\n\004Node\022\014\n\004name\030\001 \002(\t\022\021\n\ts" +
    +      "tartCode\030\002 \001(\003\022\020\n\010requests\030\003 \001(\005\022\022\n\nheap" +
    +      "SizeMB\030\004 \001(\005\022\025\n\rmaxHeapSizeMB\030\005 \001(\005\022]\n\007r" +
    +      "egions\030\006 \003(\0132L.org.apache.hadoop.hbase.r" +
    +      "est.protobuf.generated.StorageClusterSta",
    +      "tus.Region"
         };
         com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
           new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
    @@ -3935,7 +3935,7 @@ public final class StorageClusterStatusMessage {
               internal_static_org_apache_hadoop_hbase_rest_protobuf_generated_StorageClusterStatus_Region_fieldAccessorTable = new
                 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
                   internal_static_org_apache_hadoop_hbase_rest_protobuf_generated_StorageClusterStatus_Region_descriptor,
    -              new java.lang.String[] { "Name", "Stores", "Storefiles", "StorefileSizeMB", "MemstoreSizeMB", "StorefileIndexSizeMB", "ReadRequestsCount", "WriteRequestsCount", "RootIndexSizeKB", "TotalStaticIndexSizeKB", "TotalStaticBloomSizeKB", "TotalCompactingKVs", "CurrentCompactedKVs", });
    +              new java.lang.String[] { "Name", "Stores", "Storefiles", "StorefileSize", "MemstoreSizeMB", "StorefileIndexSizeMB", "ReadRequestsCount", "WriteRequestsCount", "RootIndexSize", "TotalStaticIndexSize", "TotalStaticBloomSize", "TotalCompactingKVs", "CurrentCompactedKVs", });
               internal_static_org_apache_hadoop_hbase_rest_protobuf_generated_StorageClusterStatus_Node_descriptor =
                 internal_static_org_apache_hadoop_hbase_rest_protobuf_generated_StorageClusterStatus_descriptor.getNestedTypes().get(1);
               internal_static_org_apache_hadoop_hbase_rest_protobuf_generated_StorageClusterStatus_Node_fieldAccessorTable = new
    diff --git a/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/XMLSchema.xsd b/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/XMLSchema.xsd
    index ab1b722..c75d7b5 100644
    --- a/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/XMLSchema.xsd
    +++ b/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/XMLSchema.xsd
    @@ -21,7 +21,7 @@
     
     
         
    -    
    +
         
           
           
    @@ -31,7 +31,7 @@
         
     
         
    -    
    +
         
             
                 
    @@ -45,7 +45,7 @@
         
     
         
    -    
    +
         
             
                 
    @@ -62,7 +62,7 @@
         
     
         
    -    
    +
         
             
                 
    @@ -92,7 +92,7 @@
                 
             
         
    - 
    +
         
     
         
    @@ -107,7 +107,7 @@
         
     
         
    -    
    +
         
             
                 
    @@ -134,7 +134,7 @@
         
         
    -    
    +
         
             
                 
             
             
    -        
    +        
             
             
             
             
    -        
    -        
    -        
    +        
    +        
    +        
             
             
         
    diff --git a/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/StorageClusterStatusMessage.proto b/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/StorageClusterStatusMessage.proto
    index a0291b4..d4a4298 100644
    --- a/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/StorageClusterStatusMessage.proto
    +++ b/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/StorageClusterStatusMessage.proto
    @@ -22,14 +22,14 @@ message StorageClusterStatus {
         required bytes name = 1;
         optional int32 stores = 2;
         optional int32 storefiles = 3;
    -    optional int32 storefileSizeMB = 4;
    +    optional int64 storefileSize = 4;
         optional int32 memstoreSizeMB = 5;
         optional int32 storefileIndexSizeMB = 6;
         optional int64 readRequestsCount = 7;
         optional int64 writeRequestsCount = 8;
    -    optional int32 rootIndexSizeKB = 9;
    -    optional int32 totalStaticIndexSizeKB = 10;
    -    optional int32 totalStaticBloomSizeKB = 11;
    +    optional int64 rootIndexSize = 9;
    +    optional int64 totalStaticIndexSize = 10;
    +    optional int64 totalStaticBloomSize = 11;
         optional int64 totalCompactingKVs = 12;
         optional int64 currentCompactedKVs = 13;
       }
    @@ -45,7 +45,7 @@ message StorageClusterStatus {
       repeated Node liveNodes = 1;
       repeated string deadNodes = 2;
       // summary statistics
    -  optional int32 regions = 3; 
    -  optional int32 requests = 4; 
    +  optional int32 regions = 3;
    +  optional int32 requests = 4;
       optional double averageLoad = 5;
     }
    diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterStatusModel.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterStatusModel.java
    index 36850a5..2d66b71 100644
    --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterStatusModel.java
    +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterStatusModel.java
    @@ -40,14 +40,14 @@ public class TestStorageClusterStatusModel extends TestModelBase" +
           "" +
           "" +
    +      "rootIndexSize=\"1\" storefileIndexSizeMB=\"0\" storefileSize=\"0\" storefiles=\"1\" stores=\"1\" " +
    +      "totalCompactingKVs=\"1\" totalStaticBloomSize=\"1\" totalStaticIndexSize=\"1\" writeRequestsCount=\"2\"/>" +
           "" +
           "" +
           "";
    +      "readRequestsCount=\"1\" rootIndexSize=\"1\" storefileIndexSizeMB=\"0\" storefileSize=\"0\" " +
    +      "storefiles=\"1\" stores=\"1\" totalCompactingKVs=\"1\" totalStaticBloomSize=\"1\" " +
    +      "totalStaticIndexSize=\"1\" writeRequestsCount=\"2\"/>";
     
         AS_PB =
           "Cj8KBXRlc3QxEOO6i+eeJBgAIIABKIAIMicKDWhiYXNlOnJvb3QsLDAQARgBIAAoADAAOAFAAkgB" +
    @@ -61,15 +61,15 @@ public class TestStorageClusterStatusModel extends TestModelBase regions = 
    +    Iterator regions =
           node.getRegions().iterator();
         StorageClusterStatusModel.Node.Region region = regions.next();
         assertTrue(Bytes.toString(region.getName()).equals(
             "hbase:root,,0"));
         assertEquals(region.getStores(), 1);
         assertEquals(region.getStorefiles(), 1);
    -    assertEquals(region.getStorefileSizeMB(), 0);
    +    assertEquals(region.getStorefileSize(), 0);
         assertEquals(region.getMemstoreSizeMB(), 0);
         assertEquals(region.getStorefileIndexSizeMB(), 0);
         assertEquals(region.getReadRequestsCount(), 1);
         assertEquals(region.getWriteRequestsCount(), 2);
    -    assertEquals(region.getRootIndexSizeKB(), 1);
    -    assertEquals(region.getTotalStaticIndexSizeKB(), 1);
    -    assertEquals(region.getTotalStaticBloomSizeKB(), 1);
    +    assertEquals(region.getRootIndexSize(), 1);
    +    assertEquals(region.getTotalStaticIndexSize(), 1);
    +    assertEquals(region.getTotalStaticBloomSize(), 1);
         assertEquals(region.getTotalCompactingKVs(), 1);
         assertEquals(region.getCurrentCompactedKVs(), 1);
         assertFalse(regions.hasNext());
    @@ -127,17 +127,17 @@ public class TestStorageClusterStatusModel extends TestModelBase<& serverNameLink; serverName=serverName; serverLoad = sl; &>
     <% sl.getStores() %>
     <% sl.getStorefiles() %>
    -<% sl.getStoreUncompressedSizeMB() %>m
    -<% sl.getStorefileSizeInMB() %>mb
    -<% sl.getTotalStaticIndexSizeKB() %>k
    -<% sl.getTotalStaticBloomSizeKB() %>k
    +<% StringUtils.humanReadableInt(sl.getStoreUncompressedSize()) %>
    +<% StringUtils.humanReadableInt(sl.getStorefileSize()) %>
    +<% StringUtils.humanReadableInt(sl.getTotalStaticIndexSize()) %>
    +<% StringUtils.humanReadableInt(sl.getTotalStaticBloomSize()) %>
     
     <%java>
             }  else {
    diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon
    index 3bc18cb..c132a1e 100644
    --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon
    +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon
    @@ -34,6 +34,7 @@
             org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionLoad;
             org.apache.hadoop.hbase.client.RegionReplicaUtil;
             org.apache.hadoop.hbase.regionserver.MetricsRegionWrapper;
    +        org.apache.hadoop.util.StringUtils;
     
     <%if (onlineRegions != null && onlineRegions.size() > 0) %>
     
    @@ -168,10 +169,10 @@
                 <%if load != null %>
                 <% load.getStores() %>
                 <% load.getStorefiles() %>
    -            <% load.getStoreUncompressedSizeMB() %>m
    -            <% load.getStorefileSizeMB() %>m
    -            <% load.getTotalStaticIndexSizeKB() %>k
    -            <% load.getTotalStaticBloomSizeKB() %>k
    +            <% StringUtils.humanReadableInt(load.getStoreUncompressedSize()) %>
    +            <% StringUtils.humanReadableInt(load.getStorefileSize()) %>
    +            <% StringUtils.humanReadableInt(load.getTotalStaticIndexSize()) %>
    +            <% StringUtils.humanReadableInt(load.getTotalStaticBloomSize()) %>
                 <% load.getDataLocality() %>
                 
             
    @@ -253,11 +254,11 @@
             
     
             <%for HRegionInfo r: onlineRegions %>
    -        <%java>    
    +        <%java>
                 Region region = regionServer.getFromOnlineRegions(r.getEncodedName());
                 MetricsRegionWrapper mWrap = region == null ? null: region.getMetrics().getRegionWrapper();
             
    -        
    +
             <%if mWrap != null %>
     
                 <%for Map.Entry entry: mWrap.getCoprocessorExecutionStatistics().entrySet() %>
    diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java
    index e58f855..d045d68 100644
    --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java
    +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java
    @@ -1346,7 +1346,7 @@ public class StochasticLoadBalancer extends BaseLoadBalancer {
     
         @Override
         protected double getCostFromRl(RegionLoad rl) {
    -      return rl.getStorefileSizeMB();
    +      return (rl.getStorefileSize() / 1024 / 1024);
         }
       }
     }
    diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
    index dca3415..7d53ff8 100644
    --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
    +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
    @@ -1418,30 +1418,30 @@ public class HRegionServer extends HasThread implements
         byte[] name = r.getRegionInfo().getRegionName();
         int stores = 0;
         int storefiles = 0;
    -    int storeUncompressedSizeMB = 0;
    -    int storefileSizeMB = 0;
    +    long storeUncompressedSize = 0;
    +    long storefileSize = 0;
         int memstoreSizeMB = (int) (r.getMemstoreSize() / 1024 / 1024);
         int storefileIndexSizeMB = 0;
    -    int rootIndexSizeKB = 0;
    -    int totalStaticIndexSizeKB = 0;
    -    int totalStaticBloomSizeKB = 0;
    +    long rootIndexSize = 0;
    +    long totalStaticIndexSize = 0;
    +    long totalStaticBloomSize = 0;
         long totalCompactingKVs = 0;
         long currentCompactedKVs = 0;
         List storeList = r.getStores();
         stores += storeList.size();
         for (Store store : storeList) {
           storefiles += store.getStorefilesCount();
    -      storeUncompressedSizeMB += (int) (store.getStoreSizeUncompressed() / 1024 / 1024);
    -      storefileSizeMB += (int) (store.getStorefilesSize() / 1024 / 1024);
    +      storeUncompressedSize += store.getStoreSizeUncompressed();
    +      storefileSize += store.getStorefilesSize();
           storefileIndexSizeMB += (int) (store.getStorefilesIndexSize() / 1024 / 1024);
           CompactionProgress progress = store.getCompactionProgress();
           if (progress != null) {
             totalCompactingKVs += progress.totalCompactingKVs;
             currentCompactedKVs += progress.currentCompactedKVs;
           }
    -      rootIndexSizeKB += (int) (store.getStorefilesIndexSize() / 1024);
    -      totalStaticIndexSizeKB += (int) (store.getTotalStaticIndexSize() / 1024);
    -      totalStaticBloomSizeKB += (int) (store.getTotalStaticBloomSize() / 1024);
    +      rootIndexSize += store.getStorefilesIndexSize();
    +      totalStaticIndexSize += store.getTotalStaticIndexSize();
    +      totalStaticBloomSize += store.getTotalStaticBloomSize();
         }
     
         float dataLocality =
    @@ -1457,13 +1457,13 @@ public class HRegionServer extends HasThread implements
         regionLoadBldr.setRegionSpecifier(regionSpecifier.build())
           .setStores(stores)
           .setStorefiles(storefiles)
    -      .setStoreUncompressedSizeMB(storeUncompressedSizeMB)
    -      .setStorefileSizeMB(storefileSizeMB)
    +      .setStoreUncompressedSize(storeUncompressedSize)
    +      .setStorefileSize(storefileSize)
           .setMemstoreSizeMB(memstoreSizeMB)
           .setStorefileIndexSizeMB(storefileIndexSizeMB)
    -      .setRootIndexSizeKB(rootIndexSizeKB)
    -      .setTotalStaticIndexSizeKB(totalStaticIndexSizeKB)
    -      .setTotalStaticBloomSizeKB(totalStaticBloomSizeKB)
    +      .setRootIndexSize(rootIndexSize)
    +      .setTotalStaticIndexSize(totalStaticIndexSize)
    +      .setTotalStaticBloomSize(totalStaticBloomSize)
           .setReadRequestsCount(r.getReadRequestsCount())
           .setWriteRequestsCount(r.getWriteRequestsCount())
           .setTotalCompactingKVs(totalCompactingKVs)
    diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSizeCalculator.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSizeCalculator.java
    index 643ab0e..866cc22 100644
    --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSizeCalculator.java
    +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSizeCalculator.java
    @@ -62,7 +62,7 @@ public class RegionSizeCalculator {
     
       /**
        * Computes size of each region for table and given column families.
    -   * 
    +   *
        * @deprecated Use {@link #RegionSizeCalculator(RegionLocator, Admin)} instead.
        */
       @Deprecated
    @@ -103,7 +103,6 @@ public class RegionSizeCalculator {
     
         ClusterStatus clusterStatus = admin.getClusterStatus();
         Collection servers = clusterStatus.getServers();
    -    final long megaByte = 1024L * 1024L;
     
         //iterate all cluster regions, filter regions from our table and compute their size
         for (ServerName serverName: servers) {
    @@ -114,7 +113,7 @@ public class RegionSizeCalculator {
     
             if (tableRegions.contains(regionId)) {
     
    -          long regionSizeBytes = regionLoad.getStorefileSizeMB() * megaByte;
    +          long regionSizeBytes = regionLoad.getStorefileSize();
               sizeMap.put(regionId, regionSizeBytes);
     
               if (LOG.isDebugEnabled()) {
    diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java
    index 5c56e9a..3726ab2 100644
    --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java
    +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java
    @@ -39,23 +39,23 @@ public class TestServerLoad {
         ServerLoad sl = new ServerLoad(createServerLoadProto());
         assertEquals(13, sl.getStores());
         assertEquals(114, sl.getStorefiles());
    -    assertEquals(129, sl.getStoreUncompressedSizeMB());
    -    assertEquals(504, sl.getRootIndexSizeKB());
    -    assertEquals(820, sl.getStorefileSizeInMB());
    +    assertEquals(129, sl.getStoreUncompressedSize());
    +    assertEquals(504, sl.getRootIndexSize());
    +    assertEquals(820, sl.getStorefileSize());
         assertEquals(82, sl.getStorefileIndexSizeInMB());
         assertEquals(((long)Integer.MAX_VALUE)*2, sl.getReadRequestsCount());
    -    
    +
       }
    - 
    +
       @Test
       public void testToString() {
         ServerLoad sl = new ServerLoad(createServerLoadProto());
         String slToString = sl.toString();
         assertTrue(slToString.contains("numberOfStores=13"));
         assertTrue(slToString.contains("numberOfStorefiles=114"));
    -    assertTrue(slToString.contains("storefileUncompressedSizeMB=129"));
    -    assertTrue(slToString.contains("storefileSizeMB=820")); 
    -    assertTrue(slToString.contains("rootIndexSizeKB=504"));
    +    assertTrue(slToString.contains("storefileUncompressedSize=129"));
    +    assertTrue(slToString.contains("storefileSize=820"));
    +    assertTrue(slToString.contains("rootIndexSize=504"));
         assertTrue(slToString.contains("coprocessors=[]"));
       }
     
    @@ -66,7 +66,7 @@ public class TestServerLoad {
     	  assertEquals(totalCount, sl.getReadRequestsCount());
     	  assertEquals(totalCount, sl.getWriteRequestsCount());
       }
    -  
    +
       private ClusterStatusProtos.ServerLoad createServerLoadProto() {
         HBaseProtos.RegionSpecifier rSpecOne =
             HBaseProtos.RegionSpecifier.newBuilder()
    @@ -79,12 +79,12 @@ public class TestServerLoad {
     
         ClusterStatusProtos.RegionLoad rlOne =
             ClusterStatusProtos.RegionLoad.newBuilder().setRegionSpecifier(rSpecOne).setStores(10)
    -            .setStorefiles(101).setStoreUncompressedSizeMB(106).setStorefileSizeMB(520)
    -            .setStorefileIndexSizeMB(42).setRootIndexSizeKB(201).setReadRequestsCount(Integer.MAX_VALUE).setWriteRequestsCount(Integer.MAX_VALUE).build();
    +            .setStorefiles(101).setStoreUncompressedSize(106).setStorefileSize(520)
    +            .setStorefileIndexSizeMB(42).setRootIndexSize(201).setReadRequestsCount(Integer.MAX_VALUE).setWriteRequestsCount(Integer.MAX_VALUE).build();
         ClusterStatusProtos.RegionLoad rlTwo =
             ClusterStatusProtos.RegionLoad.newBuilder().setRegionSpecifier(rSpecTwo).setStores(3)
    -            .setStorefiles(13).setStoreUncompressedSizeMB(23).setStorefileSizeMB(300)
    -            .setStorefileIndexSizeMB(40).setRootIndexSizeKB(303).setReadRequestsCount(Integer.MAX_VALUE).setWriteRequestsCount(Integer.MAX_VALUE).build();
    +            .setStorefiles(13).setStoreUncompressedSize(23).setStorefileSize(300)
    +            .setStorefileIndexSizeMB(40).setRootIndexSize(303).setReadRequestsCount(Integer.MAX_VALUE).setWriteRequestsCount(Integer.MAX_VALUE).build();
     
         ClusterStatusProtos.ServerLoad sl =
             ClusterStatusProtos.ServerLoad.newBuilder().addRegionLoads(rlOne).
    diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionSizeCalculator.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionSizeCalculator.java
    index 8b74112..e10d14b 100644
    --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionSizeCalculator.java
    +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionSizeCalculator.java
    @@ -47,7 +47,6 @@ import static org.mockito.Mockito.when;
     public class TestRegionSizeCalculator {
     
       private Configuration configuration = new Configuration();
    -  private final long megabyte = 1024L * 1024L;
     
       @Test
       public void testSimpleTestCase() throws Exception {
    @@ -67,11 +66,11 @@ public class TestRegionSizeCalculator {
     
         RegionSizeCalculator calculator = new RegionSizeCalculator(regionLocator, admin);
     
    -    assertEquals(123 * megabyte, calculator.getRegionSize("region1".getBytes()));
    -    assertEquals(54321 * megabyte, calculator.getRegionSize("region2".getBytes()));
    -    assertEquals(1232 * megabyte, calculator.getRegionSize("region3".getBytes()));
    +    assertEquals(123 , calculator.getRegionSize("region1".getBytes()));
    +    assertEquals(54321 , calculator.getRegionSize("region2".getBytes()));
    +    assertEquals(1232 , calculator.getRegionSize("region3".getBytes()));
         // if region is not inside our table, it should return 0
    -    assertEquals(0 * megabyte, calculator.getRegionSize("otherTableRegion".getBytes()));
    +    assertEquals(0 , calculator.getRegionSize("otherTableRegion".getBytes()));
     
         assertEquals(3, calculator.getRegionSizeMap().size());
       }
    @@ -94,7 +93,7 @@ public class TestRegionSizeCalculator {
     
         RegionSizeCalculator calculator = new RegionSizeCalculator(regionLocator, admin);
     
    -    assertEquals(((long) Integer.MAX_VALUE) * megabyte, calculator.getRegionSize("largeRegion".getBytes()));
    +    assertEquals((Integer.MAX_VALUE), calculator.getRegionSize("largeRegion".getBytes()));
       }
     
       /** When calculator is disabled, it should return 0 for each request.*/
    @@ -111,12 +110,12 @@ public class TestRegionSizeCalculator {
     
         //first request on enabled calculator
         RegionSizeCalculator calculator = new RegionSizeCalculator(table, admin);
    -    assertEquals(999 * megabyte, calculator.getRegionSize(regionName.getBytes()));
    +    assertEquals(999 , calculator.getRegionSize(regionName.getBytes()));
     
         //then disabled calculator.
         configuration.setBoolean(RegionSizeCalculator.ENABLE_REGIONSIZECALCULATOR, false);
         RegionSizeCalculator disabledCalculator = new RegionSizeCalculator(table, admin);
    -    assertEquals(0 * megabyte, disabledCalculator.getRegionSize(regionName.getBytes()));
    +    assertEquals(0 , disabledCalculator.getRegionSize(regionName.getBytes()));
     
         assertEquals(0, disabledCalculator.getRegionSizeMap().size());
       }
    @@ -156,11 +155,11 @@ public class TestRegionSizeCalculator {
        *
        * @param  fileSizeMb number of megabytes occupied by region in file store in megabytes
        * */
    -  private RegionLoad mockRegion(String regionName, int fileSizeMb) {
    +  private RegionLoad mockRegion(String regionName, long fileSizeMb) {
         RegionLoad region = Mockito.mock(RegionLoad.class);
         when(region.getName()).thenReturn(regionName.getBytes());
         when(region.getNameAsString()).thenReturn(regionName);
    -    when(region.getStorefileSizeMB()).thenReturn(fileSizeMb);
    +    when(region.getStorefileSize()).thenReturn(fileSizeMb);
         return region;
       }
     
    -- 
    1.9.2.msysgit.0