Repository: hbase Updated Branches: refs/heads/branch-1.3 abb269bde -> 64d6769de
HBASE-16026 Master UI should display status of additional ZK switches Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/64d6769d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/64d6769d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/64d6769d Branch: refs/heads/branch-1.3 Commit: 64d6769de197b934ad0dcdd2c3cf379115cb0f85 Parents: abb269b Author: Mikhail Antonov <[email protected]> Authored: Wed Jun 15 13:06:52 2016 -0700 Committer: Mikhail Antonov <[email protected]> Committed: Wed Jun 15 13:08:08 2016 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon | 14 ++++++++++++++ 1 file changed, 14 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/64d6769d/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 2a5bfc7..0ecc131 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 @@ -169,6 +169,20 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); is only expected to be disabled during rolling upgrade scenarios. </div> </%if> + <%if !master.isSplitOrMergeEnabled(Admin.MasterSwitchType.SPLIT) %> + <div class="alert alert-warning"> + Region splits are disabled. This may be the result of HBCK aborting while + running in repair mode. Manually enable splits from the HBase shell, + or re-run HBCK in repair mode. + </div> + </%if> + <%if !master.isSplitOrMergeEnabled(Admin.MasterSwitchType.MERGE) %> + <div class="alert alert-warning"> + Region merges are disabled. This may be the result of HBCK aborting while + running in repair mode. Manually enable merges from the HBase shell, + or re-run HBCK in repair mode. + </div> + </%if> <section> <h2>Region Servers</h2>
