Skip to content

Commit 3025c42

Browse files
Karthik Palanisamybrfrn169
Karthik Palanisamy
authored and
brfrn169
committed
HBASE-23115 Unit change for StoreFileSize and MemstoreSize (table.jsp) (#682)
Signed-off-by: Toshihiro Suzuki <brfrn169@gmail.com>
1 parent 928bd78 commit 3025c42

File tree

5 files changed

+233
-70
lines changed

5 files changed

+233
-70
lines changed

‎hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RSGroupListTmpl.jamon

Lines changed: 46 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ ServerManager serverManager;
4242
<%java>
4343
List<RSGroupInfo> groups = RSGroupTableAccessor.getAllRSGroupInfo(master.getConnection());
4444
</%java>
45-
4645
<%if (groups != null && groups.size() > 0)%>
4746

4847
<%java>
@@ -170,6 +169,10 @@ if (master.getServerManager() != null) {
170169

171170
</tr>
172171
<%java>
172+
final String ZEROMB = "0 MB";
173+
String usedHeapStr = ZEROMB;
174+
String maxHeapStr = ZEROMB;
175+
String memstoreSizeStr = ZEROMB;
173176
for (RSGroupInfo rsGroupInfo: rsGroupInfos) {
174177
String rsGroupName = rsGroupInfo.getName();
175178
long usedHeap = 0;
@@ -184,15 +187,25 @@ if (master.getServerManager() != null) {
184187
rm -> rm.getMemStoreSize().get(Size.Unit.MEGABYTE)).sum();
185188
}
186189
}
190+
191+
if (usedHeap > 0) {
192+
usedHeapStr = TraditionalBinaryPrefix.long2String(usedHeap
193+
* TraditionalBinaryPrefix.MEGA.value, "B", 1);
194+
}
195+
if (maxHeap > 0) {
196+
maxHeapStr = TraditionalBinaryPrefix.long2String(maxHeap
197+
* TraditionalBinaryPrefix.MEGA.value, "B", 1);
198+
}
199+
if (memstoreSize > 0) {
200+
memstoreSizeStr = TraditionalBinaryPrefix.long2String(memstoreSize
201+
* TraditionalBinaryPrefix.MEGA.value, "B", 1);
202+
}
187203
</%java>
188204
<tr>
189205
<td><& rsGroupLink; rsGroupName=rsGroupName; &></td>
190-
<td><% TraditionalBinaryPrefix.long2String(usedHeap
191-
* TraditionalBinaryPrefix.MEGA.value, "B", 1) %></td>
192-
<td><% TraditionalBinaryPrefix.long2String(maxHeap
193-
* TraditionalBinaryPrefix.MEGA.value, "B", 1) %></td>
194-
<td><% TraditionalBinaryPrefix.long2String(memstoreSize
195-
* TraditionalBinaryPrefix.MEGA.value, "B", 1) %></td>
206+
<td><% usedHeapStr %></td>
207+
<td><% maxHeapStr %></td>
208+
<td><% memstoreSizeStr %></td>
196209

197210
</tr>
198211
<%java>
@@ -259,6 +272,12 @@ if (master.getServerManager() != null) {
259272
<th>Bloom Size</th>
260273
</tr>
261274
<%java>
275+
final String ZEROKB = "0 KB";
276+
final String ZEROMB = "0 MB";
277+
String uncompressedStorefileSizeStr = ZEROMB;
278+
String storefileSizeStr = ZEROMB;
279+
String indexSizeStr = ZEROKB;
280+
String bloomSizeStr = ZEROKB;
262281
for (RSGroupInfo rsGroupInfo: rsGroupInfos) {
263282
String rsGroupName = rsGroupInfo.getName();
264283
int numStores = 0;
@@ -282,19 +301,31 @@ if (master.getServerManager() != null) {
282301
count++;
283302
}
284303
}
304+
if (uncompressedStorefileSize > 0) {
305+
uncompressedStorefileSizeStr = TraditionalBinaryPrefix.
306+
long2String(uncompressedStorefileSize * TraditionalBinaryPrefix.MEGA.value, "B", 1);
307+
}
308+
if (storefileSize > 0) {
309+
storefileSizeStr = TraditionalBinaryPrefix.
310+
long2String(storefileSize * TraditionalBinaryPrefix.MEGA.value, "B", 1);
311+
}
312+
if (indexSize > 0) {
313+
indexSizeStr = TraditionalBinaryPrefix.
314+
long2String(indexSize * TraditionalBinaryPrefix.KILO.value, "B", 1);
315+
}
316+
if (bloomSize > 0) {
317+
bloomSizeStr = TraditionalBinaryPrefix.
318+
long2String(bloomSize * TraditionalBinaryPrefix.KILO.value, "B", 1);
319+
}
285320
</%java>
286321
<tr>
287322
<td><& rsGroupLink; rsGroupName=rsGroupName; &></td>
288323
<td><% numStores %></td>
289324
<td><% numStorefiles %></td>
290-
<td><% TraditionalBinaryPrefix.long2String(
291-
uncompressedStorefileSize * TraditionalBinaryPrefix.MEGA.value, "B", 1) %></td>
292-
<td><% TraditionalBinaryPrefix.long2String(
293-
storefileSize * TraditionalBinaryPrefix.MEGA.value, "B", 1) %></td>
294-
<td><% TraditionalBinaryPrefix.long2String(
295-
indexSize * TraditionalBinaryPrefix.KILO.value, "B", 1) %></td>
296-
<td><% TraditionalBinaryPrefix.long2String(
297-
bloomSize * TraditionalBinaryPrefix.KILO.value, "B", 1) %></td>
325+
<td><% uncompressedStorefileSizeStr %></td>
326+
<td><% storefileSizeStr %></td>
327+
<td><% indexSizeStr %></td>
328+
<td><% bloomSizeStr %></td>
298329
</tr>
299330
<%java>
300331
}

‎hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon

Lines changed: 48 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ HMaster master;
3737
org.apache.hadoop.util.StringUtils.TraditionalBinaryPrefix;
3838
</%import>
3939

40-
4140
<%if (servers != null && servers.size() > 0)%>
4241

4342
<%java>
@@ -162,24 +161,38 @@ Arrays.sort(serverNames);
162161
</thead>
163162
<tbody>
164163
<%java>
164+
final String ZEROMB = "0 MB";
165+
String usedHeapStr = ZEROMB;
166+
String maxHeapStr = ZEROMB;
167+
String memStoreSizeMBStr = ZEROMB;
165168
for (ServerName serverName: serverNames) {
166-
167169
ServerMetrics sl = master.getServerManager().getLoad(serverName);
168170
if (sl != null) {
169171
long memStoreSizeMB = 0;
170172
for (RegionMetrics rl : sl.getRegionMetrics().values()) {
171173
memStoreSizeMB += rl.getMemStoreSize().get(Size.Unit.MEGABYTE);
172174
}
175+
if (memStoreSizeMB > 0) {
176+
memStoreSizeMBStr = TraditionalBinaryPrefix.long2String(memStoreSizeMB
177+
* TraditionalBinaryPrefix.MEGA.value, "B", 1);
178+
}
179+
180+
double usedHeapSizeMB = sl.getUsedHeapSize().get(Size.Unit.MEGABYTE);
181+
if (usedHeapSizeMB > 0) {
182+
usedHeapStr = TraditionalBinaryPrefix.long2String((long) usedHeapSizeMB
183+
* TraditionalBinaryPrefix.MEGA.value, "B", 1);
184+
}
185+
double maxHeapSizeMB = sl.getMaxHeapSize().get(Size.Unit.MEGABYTE);
186+
if (maxHeapSizeMB > 0) {
187+
maxHeapStr = TraditionalBinaryPrefix.long2String((long) maxHeapSizeMB
188+
* TraditionalBinaryPrefix.MEGA.value, "B", 1);
189+
}
173190
</%java>
174191
<tr>
175192
<td><& serverNameLink; serverName=serverName; &></td>
176-
<td><% TraditionalBinaryPrefix.long2String((long) sl.getUsedHeapSize().get(Size.Unit.MEGABYTE)
177-
* TraditionalBinaryPrefix.MEGA.value, "B", 1) %></td>
178-
<td><% TraditionalBinaryPrefix.long2String((long) sl.getMaxHeapSize().get(Size.Unit.MEGABYTE)
179-
* TraditionalBinaryPrefix.MEGA.value, "B", 1) %></td>
180-
<td><% TraditionalBinaryPrefix.long2String(memStoreSizeMB
181-
* TraditionalBinaryPrefix.MEGA.value, "B", 1) %></td>
182-
193+
<td><% usedHeapStr %></td>
194+
<td><% maxHeapStr %></td>
195+
<td><% memStoreSizeMBStr %></td>
183196
</tr>
184197
<%java>
185198
} else {
@@ -261,6 +274,12 @@ if (sl != null) {
261274
</thead>
262275
<tbody>
263276
<%java>
277+
final String ZEROKB = "0 KB";
278+
final String ZEROMB = "0 MB";
279+
String storeUncompressedSizeMBStr = ZEROMB;
280+
String storeFileSizeMBStr = ZEROMB;
281+
String totalStaticIndexSizeKBStr = ZEROKB;
282+
String totalStaticBloomSizeKBStr = ZEROKB;
264283
for (ServerName serverName: serverNames) {
265284

266285
ServerMetrics sl = master.getServerManager().getLoad(serverName);
@@ -279,19 +298,31 @@ if (sl != null) {
279298
totalStaticIndexSizeKB += rl.getStoreFileUncompressedDataIndexSize().get(Size.Unit.KILOBYTE);
280299
totalStaticBloomSizeKB += rl.getBloomFilterSize().get(Size.Unit.KILOBYTE);
281300
}
301+
if (storeUncompressedSizeMB > 0) {
302+
storeUncompressedSizeMBStr = TraditionalBinaryPrefix.
303+
long2String(storeUncompressedSizeMB * TraditionalBinaryPrefix.MEGA.value, "B", 1);
304+
}
305+
if (storeFileSizeMB > 0) {
306+
storeFileSizeMBStr = TraditionalBinaryPrefix.
307+
long2String(storeFileSizeMB * TraditionalBinaryPrefix.MEGA.value, "B", 1);
308+
}
309+
if (totalStaticIndexSizeKB > 0) {
310+
totalStaticIndexSizeKBStr = TraditionalBinaryPrefix.
311+
long2String(totalStaticIndexSizeKB * TraditionalBinaryPrefix.KILO.value, "B", 1);
312+
}
313+
if (totalStaticBloomSizeKB > 0) {
314+
totalStaticBloomSizeKBStr = TraditionalBinaryPrefix.
315+
long2String(totalStaticBloomSizeKB * TraditionalBinaryPrefix.KILO.value, "B", 1);
316+
}
282317
</%java>
283318
<tr>
284319
<td><& serverNameLink; serverName=serverName; &></td>
285320
<td><% String.format("%,d", storeCount) %></td>
286321
<td><% String.format("%,d", storeFileCount) %></td>
287-
<td><% TraditionalBinaryPrefix.long2String(
288-
storeUncompressedSizeMB * TraditionalBinaryPrefix.MEGA.value, "B", 1) %></td>
289-
<td><% TraditionalBinaryPrefix.long2String(storeFileSizeMB
290-
* TraditionalBinaryPrefix.MEGA.value, "B", 1) %></td>
291-
<td><% TraditionalBinaryPrefix.long2String(totalStaticIndexSizeKB
292-
* TraditionalBinaryPrefix.KILO.value, "B", 1) %></td>
293-
<td><% TraditionalBinaryPrefix.long2String(totalStaticBloomSizeKB
294-
* TraditionalBinaryPrefix.KILO.value, "B", 1) %></td>
322+
<td><% storeUncompressedSizeMBStr %></td>
323+
<td><% storeFileSizeMBStr %></td>
324+
<td><% totalStaticIndexSizeKBStr %></td>
325+
<td><% totalStaticBloomSizeKBStr %></td>
295326
</tr>
296327
<%java>
297328
} else {

‎hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon

Lines changed: 42 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -176,22 +176,46 @@
176176

177177
<tr>
178178
<%java>
179+
final String ZEROMB = "0 MB";
180+
final String ZEROKB = "0 KB";
181+
String uncompressedStorefileSizeStr = ZEROMB;
182+
String storefileSizeStr = ZEROMB;
183+
String indexSizeStr = ZEROKB;
184+
String bloomSizeStr = ZEROKB;
179185
RegionLoad load = regionServer.createRegionLoad(r.getEncodedName());
180186
String displayName = RegionInfoDisplay.getRegionNameAsStringForDisplay(r,
181187
regionServer.getConfiguration());
188+
if (load != null) {
189+
long uncompressedStorefileSize = load.getStoreUncompressedSizeMB();
190+
long storefileSize = load.getStorefileSizeMB();
191+
long indexSize = load.getTotalStaticIndexSizeKB();
192+
long bloomSize = load.getTotalStaticBloomSizeKB();
193+
if (uncompressedStorefileSize > 0) {
194+
uncompressedStorefileSizeStr = TraditionalBinaryPrefix.long2String(
195+
uncompressedStorefileSize * TraditionalBinaryPrefix.MEGA.value, "B", 1);
196+
}
197+
if (storefileSize > 0) {
198+
storefileSizeStr = TraditionalBinaryPrefix.long2String(storefileSize
199+
* TraditionalBinaryPrefix.MEGA.value, "B", 1);
200+
}
201+
if(indexSize > 0) {
202+
indexSizeStr = TraditionalBinaryPrefix.long2String(indexSize
203+
* TraditionalBinaryPrefix.KILO.value, "B", 1);
204+
}
205+
if (bloomSize > 0) {
206+
bloomSizeStr = TraditionalBinaryPrefix.long2String(bloomSize
207+
* TraditionalBinaryPrefix.KILO.value, "B", 1);
208+
}
209+
}
182210
</%java>
183211
<td><a href="region.jsp?name=<% r.getEncodedName() %>"><% displayName %></a></td>
184212
<%if load != null %>
185213
<td><% String.format("%,1d", load.getStores()) %></td>
186214
<td><% String.format("%,1d", load.getStorefiles()) %></td>
187-
<td><% TraditionalBinaryPrefix.long2String(load.getStoreUncompressedSizeMB()
188-
* TraditionalBinaryPrefix.MEGA.value, "B", 1)%></td>
189-
<td><% TraditionalBinaryPrefix.long2String(load.getStorefileSizeMB()
190-
* TraditionalBinaryPrefix.MEGA.value, "B", 1) %></td>
191-
<td><% TraditionalBinaryPrefix.long2String(load.getTotalStaticIndexSizeKB()
192-
* TraditionalBinaryPrefix.KILO.value, "B", 1) %></td>
193-
<td><% TraditionalBinaryPrefix.long2String(load.getTotalStaticBloomSizeKB()
194-
* TraditionalBinaryPrefix.KILO.value, "B", 1) %></td>
215+
<td><% uncompressedStorefileSizeStr %></td>
216+
<td><% storefileSizeStr %></td>
217+
<td><% indexSizeStr %></td>
218+
<td><% bloomSizeStr %></td>
195219
<td><% load.getDataLocality() %></td>
196220
</%if>
197221
</tr>
@@ -267,14 +291,22 @@
267291

268292
<tr>
269293
<%java>
294+
final String ZEROMB = "0 MB";
295+
String memStoreSizeMBStr = ZEROMB;
270296
RegionLoad load = regionServer.createRegionLoad(r.getEncodedName());
271297
String displayName = RegionInfoDisplay.getRegionNameAsStringForDisplay(r,
272298
regionServer.getConfiguration());
299+
if (load != null) {
300+
long memStoreSizeMB = load.getMemStoreSizeMB();
301+
if (memStoreSizeMB > 0) {
302+
memStoreSizeMBStr = TraditionalBinaryPrefix.long2String(
303+
memStoreSizeMB * TraditionalBinaryPrefix.MEGA.value, "B", 1);
304+
}
305+
}
273306
</%java>
274307
<td><a href="region.jsp?name=<% r.getEncodedName() %>"><% displayName %></a></td>
275308
<%if load != null %>
276-
<td><% TraditionalBinaryPrefix.long2String(
277-
load.getMemStoreSizeMB() * TraditionalBinaryPrefix.MEGA.value, "B", 1) %></td>
309+
<td><% memStoreSizeMBStr %></td>
278310
</%if>
279311
</tr>
280312
</%for>

0 commit comments

Comments
 (0)