You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2015/05/28 08:16:54 UTC
hbase git commit: HBASE-13777 Table fragmentation display triggers
NPE on master status page
Repository: hbase
Updated Branches:
refs/heads/master bb0d64b77 -> 91a509036
HBASE-13777 Table fragmentation display triggers NPE on master status page
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/91a50903
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/91a50903
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/91a50903
Branch: refs/heads/master
Commit: 91a5090365204b6f9daf2b679a259a69989a49f1
Parents: bb0d64b
Author: Lars George <la...@apache.org>
Authored: Wed May 27 10:22:13 2015 +0200
Committer: Lars George <la...@apache.org>
Committed: Thu May 28 08:14:36 2015 +0200
----------------------------------------------------------------------
.../hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/91a50903/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
----------------------------------------------------------------------
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
@@ -215,7 +215,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
<section>
<& BackupMasterStatusTmpl; master = master &>
</section>
- </%if>
+ </%if>
<section>
@@ -367,7 +367,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
<%def userTables>
<%java>
- HTableDescriptor[] tables = null;
+ HTableDescriptor[] tables = null;
try (Admin admin = master.getConnection().getAdmin()) {
tables = master.isInitialized() ? admin.listTables() : null;
}
@@ -389,9 +389,10 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
</tr>
<%for HTableDescriptor htDesc : tables%>
<%java>
+ TableName tableName = htDesc.getTableName();
Map<RegionState.State, List<HRegionInfo>> 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;
</%java>
<tr>
- <td><% htDesc.getTableName().getNamespaceAsString() %></td>
- <td><a href=table.jsp?name=<% htDesc.getTableName().getNameAsString() %>><% htDesc.getTableName().getQualifierAsString() %></a> </td>
+ <td><% tableName.getNamespaceAsString() %></td>
+ <td><a href=table.jsp?name=<% tableName.getNameAsString() %>><% tableName.getQualifierAsString() %></a> </td>
<%if (frags != null) %>
- <td align="center"><% frags.get(htDesc.getTableName().getNameAsString()) != null ? frags.get(htDesc.getTableName().getQualifierAsString()).intValue() + "%" : "n/a" %></td>
+ <td align="center"><% frags.get(tableName.getNameAsString()) != null ? frags.get(tableName.getNameAsString()).intValue() + "%" : "n/a" %></td>
</%if>
<td><% openRegionsCount %></td>
<td><% offlineRegionsCount %></td>