From 4ee5d3b5ecfb30bd8be57e4a7841e208e8d9dd8a Mon Sep 17 00:00:00 2001 From: Lars George Date: Wed, 27 May 2015 10:22:13 +0200 Subject: [PATCH] HBASE-13777 Table fragmentation display triggers NPE on master status page --- .../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon index fe9c0ad..0cc6758 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon @@ -389,9 +389,10 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); <%for HTableDescriptor htDesc : tables%> <%java> + TableName tableName = htDesc.getTableName(); Map> tableRegions = master.getAssignmentManager().getRegionStates() - .getRegionByStateOfTable(htDesc.getTableName()); + .getRegionByStateOfTable(tableName); int openRegionsCount = tableRegions.get(RegionState.State.OPEN).size(); int offlineRegionsCount = tableRegions.get(RegionState.State.OFFLINE).size(); int splitRegionsCount = tableRegions.get(RegionState.State.SPLIT).size(); @@ -407,10 +408,10 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); - splitRegionsCount; - <% htDesc.getTableName().getNamespaceAsString() %> - ><% htDesc.getTableName().getQualifierAsString() %> + <% tableName.getNamespaceAsString() %> + ><% tableName.getQualifierAsString() %> <%if (frags != null) %> - <% frags.get(htDesc.getTableName().getNameAsString()) != null ? frags.get(htDesc.getTableName().getQualifierAsString()).intValue() + "%" : "n/a" %> + <% frags.get(tableName.getNameAsString()) != null ? frags.get(tableName.getNameAsString()).intValue() + "%" : "n/a" %> <% openRegionsCount %> <% offlineRegionsCount %> -- 2.1.3