Skip to content
Closed
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 24 additions & 7 deletions hbase-server/src/main/resources/hbase-webapps/master/table.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -383,11 +383,21 @@ if (fqtn != null && master.isInitialized()) {
CompactionState compactionState = admin.getCompactionState(table.getName()).get();
%><%= compactionState %><%
} catch (Exception e) {
// Nothing really to do here
// Nothing really to do here
%>
Unknown
<div onclick="document.getElementById('closeCompaction').style.display='block';document.getElementById('openCompaction').style.display='none';">
<a id="openCompaction" style="cursor:pointer;"> Show StackTrace</a>
</div>
<div id="closeCompaction" style="display:none;clear:both;">
<div onclick="document.getElementById('closeCompaction').style.display='none';document.getElementById('openCompaction').style.display='block';">
<a style="cursor:pointer;"> Close StackTrace</a>
</div>
<%
for(StackTraceElement element : e.getStackTrace()) {
%><%= StringEscapeUtils.escapeHtml4(element.toString()) %><%
%><%= StringEscapeUtils.escapeHtml4(element.toString() + "\n") %><%
}
%> Unknown <%
%></div><%
}
} else {
%><%= CompactionState.NONE %><%
Expand Down Expand Up @@ -834,12 +844,19 @@ if (withReplica) {
</tbody>
</table>
<% }
} catch(Exception ex) {
} catch(Exception ex) { %>
Unknown Issue with Regions
<div onclick="document.getElementById('closeRegion').style.display='block';document.getElementById('openRegion').style.display='none';">
<a id="openRegion" style="cursor:pointer;"> Show StackTrace</a>
</div>
<div id="closeRegion" style="display:none;clear:both;">
<div onclick="document.getElementById('closeRegion').style.display='none';document.getElementById('openRegion').style.display='block';">
<a style="cursor:pointer;"> Close StackTrace</a>
</div>
<%
for(StackTraceElement element : ex.getStackTrace()) {
%><%= StringEscapeUtils.escapeHtml4(element.toString()) %><%
%><%= StringEscapeUtils.escapeHtml4(element.toString() + "\n") %><%
}
} finally {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removal of finally seems unintentional

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Previous commit was conflicted in code of the finally section.
The HBASE-23653 removed the section and closed connection by changing hbase-server/src/test/java/org/apache/hadoop/hbase/ConnectionRule.java.
I thought I should keep compatibility with the HBASE-23653.
How should I modify the code intentionally?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure sounds good. Btw, QA run output says branch needs rebase with master. Could you please rebase one more time? Hopefully we should be able to merge after that.
Thanks

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for comment. I rebased HBASE-23578 with master.

connection.close();
}
} // end else
%>
Expand Down