HBASE-16657 addendum handle null RegionLoad
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0704aed4 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0704aed4 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0704aed4 Branch: refs/heads/branch-1.3 Commit: 0704aed44222afe2f730f1681c7893ba6e2e9a8a Parents: b32e7ce Author: Gary Helmling <ga...@apache.org> Authored: Fri Oct 7 12:01:46 2016 -0700 Committer: Gary Helmling <ga...@apache.org> Committed: Fri Oct 7 14:20:33 2016 -0700 ---------------------------------------------------------------------- .../hbase/tmpl/regionserver/RegionListTmpl.jamon | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/0704aed4/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 4c35cf4..c472115 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 @@ -201,15 +201,16 @@ <%java> RegionLoad load = regionServer.createRegionLoad(r.getEncodedName()); String percentDone = ""; - if (load != null && load.getTotalCompactingKVs() > 0) { - percentDone = String.format("%.2f", 100 * - ((float) load.getCurrentCompactedKVs() / load.getTotalCompactingKVs())) + "%"; - } - long lastMajorCompactionTs = load.getLastMajorCompactionTs(); String compactTime = ""; - if (lastMajorCompactionTs > 0) { - FastDateFormat fdf = FastDateFormat.getInstance("yyyy-MM-dd HH:mm ZZ"); - compactTime = fdf.format(lastMajorCompactionTs); + if (load != null) { + if (load.getTotalCompactingKVs() > 0) { + percentDone = String.format("%.2f", 100 * + ((float) load.getCurrentCompactedKVs() / load.getTotalCompactingKVs())) + "%"; + } + if (load.getLastMajorCompactionTs() > 0) { + FastDateFormat fdf = FastDateFormat.getInstance("yyyy-MM-dd HH:mm ZZ"); + compactTime = fdf.format(load.getLastMajorCompactionTs()); + } } </%java> <td><a href="region.jsp?name=<% r.getEncodedName() %>">
