Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-2631 Decide between InMB and MB as suffix for field names in ClusterStatus objects 

Signed-off-by: Chia-Ping Tsai <chia7712@gmail.com>
This commit is contained in:
Deon Huang 2017-08-13 21:52:03 +08:00 committed by Chia-Ping Tsai
parent 8775f3027f
commit 5073bd6e04
3 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
View File

@ -131,18 +131,45 @@ public class ServerLoad {
return storeUncompressedSizeMB;
}
/**
* @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0
* Use {@link #getStorefileSizeMB()} instead.
*/
@Deprecated
public int getStorefileSizeInMB() {
return storefileSizeMB;
}
public int getStorefileSizeMB() {
return storefileSizeMB;
}
/**
* @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0
* Use {@link #getMemstoreSizeMB()} instead.
*/
@Deprecated
public int getMemstoreSizeInMB() {
return memstoreSizeMB;
}
public int getMemstoreSizeMB() {
return memstoreSizeMB;
}
/**
* @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0
* Use {@link #getStorefileIndexSizeMB()} instead.
*/
@Deprecated
public int getStorefileIndexSizeInMB() {
return storefileIndexSizeMB;
}
public int getStorefileIndexSizeMB() {
return storefileIndexSizeMB;
}
public long getReadRequestsCount() {
return readRequestsCount;
}

4
hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
View File

@ -153,7 +153,7 @@ for (ServerName serverName: serverNames) {
* TraditionalBinaryPrefix.MEGA.value, "B", 1) %></td>
<td><% TraditionalBinaryPrefix.long2String(sl.getMaxHeapMB()
* TraditionalBinaryPrefix.MEGA.value, "B", 1) %></td>
<td><% TraditionalBinaryPrefix.long2String(sl.getMemstoreSizeInMB()
<td><% TraditionalBinaryPrefix.long2String(sl.getMemstoreSizeMB()
* TraditionalBinaryPrefix.MEGA.value, "B", 1) %></td>
</tr>
@ -232,7 +232,7 @@ if (sl != null) {
<td><% sl.getStorefiles() %></td>
<td><% TraditionalBinaryPrefix.long2String(
sl.getStoreUncompressedSizeMB() * TraditionalBinaryPrefix.MEGA.value, "B", 1) %></td>
<td><% TraditionalBinaryPrefix.long2String(sl.getStorefileSizeInMB()
<td><% TraditionalBinaryPrefix.long2String(sl.getStorefileSizeMB()
* TraditionalBinaryPrefix.MEGA.value, "B", 1) %></td>
<td><% TraditionalBinaryPrefix.long2String(sl.getTotalStaticIndexSizeKB()
* TraditionalBinaryPrefix.KILO.value, "B", 1) %></td>

6
hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java
View File

@ -41,8 +41,8 @@ public class TestServerLoad {
assertEquals(114, sl.getStorefiles());
assertEquals(129, sl.getStoreUncompressedSizeMB());
assertEquals(504, sl.getRootIndexSizeKB());
assertEquals(820, sl.getStorefileSizeInMB());
assertEquals(82, sl.getStorefileIndexSizeInMB());
assertEquals(820, sl.getStorefileSizeMB());
assertEquals(82, sl.getStorefileIndexSizeMB());
assertEquals(((long)Integer.MAX_VALUE)*2, sl.getReadRequestsCount());
assertEquals(300, sl.getFilteredReadRequestsCount());
@ -68,7 +68,7 @@ public class TestServerLoad {
assertEquals(totalCount, sl.getReadRequestsCount());
assertEquals(totalCount, sl.getWriteRequestsCount());
}
private ClusterStatusProtos.ServerLoad createServerLoadProto() {
HBaseProtos.RegionSpecifier rSpecOne =
HBaseProtos.RegionSpecifier.newBuilder()