Repository: hbase Updated Branches: refs/heads/master dd6f4525e -> 70240f973
HBASE-20132 Change the "KV" to "Cell" for web UI Signed-off-by: Chia-Ping Tsai <chia7...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/70240f97 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/70240f97 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/70240f97 Branch: refs/heads/master Commit: 70240f9732da11484b47eb720a39c1cc8bb1a4e4 Parents: dd6f452 Author: Guangxu Cheng <guangxuch...@gmail.com> Authored: Mon Mar 5 11:20:25 2018 +0800 Committer: Chia-Ping Tsai <chia7...@gmail.com> Committed: Sat Mar 10 12:27:59 2018 +0800 ---------------------------------------------------------------------- .../hadoop/hbase/tmpl/master/RSGroupListTmpl.jamon | 12 ++++++------ .../hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon | 6 +++--- .../hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/70240f97/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RSGroupListTmpl.jamon ---------------------------------------------------------------------- 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 9a0e369..41fe487 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) { <table class="table table-striped"> <tr> <th>RSGroup Name</th> - <th>Num. Compacting KVs</th> - <th>Num. Compacted KVs</th> - <th>Remaining KVs</th> + <th>Num. Compacting Cells</th> + <th>Num. Compacted Cells</th> + <th>Remaining Cells</th> <th>Compaction Progress</th> </tr> <%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) { <td><& rsGroupLink; rsGroupName=rsGroupName; &></td> <td><% totalCompactingCells %></td> <td><% totalCompactedCells %></td> -<td><% remainingKVs %></td> +<td><% remainingCells %></td> <td><% percentDone %></td> </tr> <%java> http://git-wip-us.apache.org/repos/asf/hbase/blob/70240f97/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon ---------------------------------------------------------------------- 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 fb7dd54..f353d32 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) { <table class="table table-striped"> <tr> <th>ServerName</th> - <th>Num. Compacting KVs</th> - <th>Num. Compacted KVs</th> - <th>Remaining KVs</th> + <th>Num. Compacting Cells</th> + <th>Num. Compacted Cells</th> + <th>Remaining Cells</th> <th>Compaction Progress</th> </tr> <%java> http://git-wip-us.apache.org/repos/asf/hbase/blob/70240f97/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon ---------------------------------------------------------------------- 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 d16ce06..6a01533 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 @@ <table class="table table-striped"> <tr> <th>Region Name</th> - <th>Num. Compacting KVs</th> - <th>Num. Compacted KVs</th> + <th>Num. Compacting Cells</th> + <th>Num. Compacted Cells</th> <th>Compaction Progress</th> <th>Last Major Compaction</th> </tr>
