diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RSGroupListTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RSGroupListTmpl.jamon index 9a0e36916f1..41fe487f0ec 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RSGroupListTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RSGroupListTmpl.jamon @@ -310,9 +310,9 @@ if (master.getServerManager() != null) { - - - + + + <%java> @@ -321,7 +321,7 @@ if (master.getServerManager() != null) { int numStores = 0; long totalCompactingCells = 0; long totalCompactedCells = 0; - long remainingKVs = 0; + long remainingCells = 0; long compactionProgress = 0; for (Address server : rsGroupInfo.getServers()) { ServerMetrics sl = collectServers.get(server); @@ -332,7 +332,7 @@ if (master.getServerManager() != null) { } } } - remainingKVs = totalCompactingCells - totalCompactedCells; + remainingCells = totalCompactingCells - totalCompactedCells; String percentDone = ""; if (totalCompactingCells > 0) { percentDone = String.format("%.2f", 100 * @@ -343,7 +343,7 @@ if (master.getServerManager() != null) { - + <%java> diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon index fb7dd54d0b3..f353d32de56 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon @@ -289,9 +289,9 @@ if (sl != null) {
RSGroup NameNum. Compacting KVsNum. Compacted KVsRemaining KVsNum. Compacting CellsNum. Compacted CellsRemaining Cells Compaction Progress
<& rsGroupLink; rsGroupName=rsGroupName; &> <% totalCompactingCells %> <% totalCompactedCells %><% remainingKVs %><% remainingCells %> <% percentDone %>
- - - + + + <%java> 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 d16ce06fbd0..6a0153395e7 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 @@ -196,8 +196,8 @@
ServerNameNum. Compacting KVsNum. Compacted KVsRemaining KVsNum. Compacting CellsNum. Compacted CellsRemaining Cells Compaction Progress
- - + +
Region NameNum. Compacting KVsNum. Compacted KVsNum. Compacting CellsNum. Compacted Cells Compaction Progress Last Major Compaction