Skip to content

Commit 42b39da

Browse files
infraioJenkins
authored andcommitted
HBASE-23005 Table UI showed exception message when table is disabled (apache#602)
Signed-off-by: Sean Busbey <busbey@apache.org> (cherry picked from commit 01ece36) Change-Id: Ia23bcbeb1535f1d5c850e41847b819c46fd1cc38
1 parent 52cd6d9 commit 42b39da

1 file changed

Lines changed: 13 additions & 11 deletions

File tree

  • hbase-server/src/main/resources/hbase-webapps/master

hbase-server/src/main/resources/hbase-webapps/master/table.jsp

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -263,24 +263,26 @@ if (fqtn != null && master.isInitialized()) {
263263
</tr>
264264
<tr>
265265
<td>Enabled</td>
266-
<td><%= admin.isTableEnabled(table.getName()).get() %></td>
266+
<td><%= master.getAssignmentManager().isTableEnabled(table.getName()) %></td>
267267
<td>Is the table enabled</td>
268268
</tr>
269269
<tr>
270270
<td>Compaction</td>
271271
<td>
272272
<%
273-
try {
274-
CompactionState compactionState = admin.getCompactionState(table.getName()).get();
275-
%>
276-
<%= compactionState %>
277-
<%
278-
} catch (Exception e) {
279-
// Nothing really to do here
280-
for(StackTraceElement element : e.getStackTrace()) {
281-
%><%= StringEscapeUtils.escapeHtml4(element.toString()) %><%
273+
if (master.getAssignmentManager().isTableEnabled(table.getName())) {
274+
try {
275+
CompactionState compactionState = admin.getCompactionState(table.getName()).get();
276+
%><%= compactionState %><%
277+
} catch (Exception e) {
278+
// Nothing really to do here
279+
for(StackTraceElement element : e.getStackTrace()) {
280+
%><%= StringEscapeUtils.escapeHtml4(element.toString()) %><%
281+
}
282+
%> Unknown <%
282283
}
283-
%> Unknown <%
284+
} else {
285+
%><%= CompactionState.NONE %><%
284286
}
285287
%>
286288
</td>

0 commit comments

Comments
 (0)