From 5abf13c5cbe47c64576ae8167179287c5e54d297 Mon Sep 17 00:00:00 2001 From: Andy Yang Date: Sat, 26 Aug 2017 03:46:38 -0700 Subject: [PATCH] HBASE-3935 HServerLoad.storefileIndexSizeMB should be changed to storefileIndexSizeKB --- .../main/java/org/apache/hadoop/hbase/ServerLoad.java | 18 +++++++++--------- .../java/org/apache/hadoop/hbase/TestServerLoad.java | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) 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 8d4c7d3648..103bdc32cd 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 @@ -45,7 +45,7 @@ public class ServerLoad { private int storeUncompressedSizeMB = 0; private int storefileSizeMB = 0; private int memstoreSizeMB = 0; - private int storefileIndexSizeMB = 0; + private int storefileIndexSizeKB = 0; private long readRequestsCount = 0; private long filteredReadRequestsCount = 0; private long writeRequestsCount = 0; @@ -64,7 +64,7 @@ public class ServerLoad { storeUncompressedSizeMB += rl.getStoreUncompressedSizeMB(); storefileSizeMB += rl.getStorefileSizeMB(); memstoreSizeMB += rl.getMemstoreSizeMB(); - storefileIndexSizeMB += rl.getStorefileIndexSizeMB(); + storefileIndexSizeKB += rl.getStorefileIndexSizeMB()*1024 ; readRequestsCount += rl.getReadRequestsCount(); filteredReadRequestsCount += rl.getFilteredReadRequestsCount(); writeRequestsCount += rl.getWriteRequestsCount(); @@ -159,15 +159,15 @@ public class ServerLoad { /** * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 - * Use {@link #getStorefileIndexSizeMB()} instead. + * Use {@link #getStorefileIndexSizeKB()} instead. */ @Deprecated - public int getStorefileIndexSizeInMB() { - return storefileIndexSizeMB; + public int getStorefileIndexSizeInKB() { + return storefileIndexSizeKB; } - public int getStorefileIndexSizeMB() { - return storefileIndexSizeMB; + public int getStorefileIndexSizeKB() { + return storefileIndexSizeKB; } public long getReadRequestsCount() { @@ -327,8 +327,8 @@ public class ServerLoad { } sb = Strings.appendKeyValue(sb, "memstoreSizeMB", Integer.valueOf(this.memstoreSizeMB)); sb = - Strings.appendKeyValue(sb, "storefileIndexSizeMB", - Integer.valueOf(this.storefileIndexSizeMB)); + Strings.appendKeyValue(sb, "storefileIndexSizeKB", + Integer.valueOf(this.storefileIndexSizeKB)); sb = Strings.appendKeyValue(sb, "readRequestsCount", Long.valueOf(this.readRequestsCount)); sb = Strings.appendKeyValue(sb, "filteredReadRequestsCount", Long.valueOf(this.filteredReadRequestsCount)); 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 2d248b04c9..e269bc7e39 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 @@ -42,7 +42,7 @@ public class TestServerLoad { assertEquals(129, sl.getStoreUncompressedSizeMB()); assertEquals(504, sl.getRootIndexSizeKB()); assertEquals(820, sl.getStorefileSizeMB()); - assertEquals(82, sl.getStorefileIndexSizeMB()); + assertEquals(83968, sl.getStorefileIndexSizeKB()); assertEquals(((long)Integer.MAX_VALUE)*2, sl.getReadRequestsCount()); assertEquals(300, sl.getFilteredReadRequestsCount()); -- 2.11.0