You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by sy...@apache.org on 2016/06/17 05:02:01 UTC

[19/30] hbase git commit: HBASE-16026 Master UI should display status of additional ZK switches

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/5f9d1a71
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5f9d1a71
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5f9d1a71

Branch: refs/heads/hbase-12439
Commit: 5f9d1a71c8b920631062b7a30c1e73a8da5e6988
Parents: 114fe7a
Author: Mikhail Antonov <an...@apache.org>
Authored: Wed Jun 15 12:58:41 2016 -0700
Committer: Mikhail Antonov <an...@apache.org>
Committed: Wed Jun 15 12:59:24 2016 -0700

----------------------------------------------------------------------
 .../hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/5f9d1a71/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 e39ad8a..056c2d7 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
@@ -39,6 +39,7 @@ org.apache.hadoop.hbase.ServerLoad;
 org.apache.hadoop.hbase.ServerName;
 org.apache.hadoop.hbase.TableName;
 org.apache.hadoop.hbase.client.Admin;
+org.apache.hadoop.hbase.client.MasterSwitchType;
 org.apache.hadoop.hbase.client.SnapshotDescription;
 org.apache.hadoop.hbase.master.AssignmentManager;
 org.apache.hadoop.hbase.master.DeadServer;
@@ -168,6 +169,20 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
             is only expected to be disabled during rolling upgrade scenarios.
           </div>
         </%if>
+        <%if !master.isSplitOrMergeEnabled(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(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>