[2/2] hbase git commit: HBASE-21410 A helper page that help find all problematic regions and procedures

2018-11-08 Thread zghao
HBASE-21410 A helper page that help find all problematic regions and procedures

Signed-off-by: Guanghao Zhang 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6f602db5
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6f602db5
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6f602db5

Branch: refs/heads/branch-2
Commit: 6f602db5f229e995fd028f1c819f624a0ac5926b
Parents: f936a10
Author: jingyuntian 
Authored: Thu Nov 8 15:30:30 2018 +0800
Committer: Guanghao Zhang 
Committed: Fri Nov 9 14:02:57 2018 +0800

--
 .../master/AssignmentManagerStatusTmpl.jamon|   2 +-
 .../hbase/tmpl/master/MasterStatusTmpl.jamon|  10 +-
 .../resources/hbase-webapps/master/rits.jsp | 120 +++
 3 files changed, 126 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/6f602db5/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon
--
diff --git 
a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon
 
b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon
index b94ba43..9c6916e 100644
--- 
a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon
+++ 
b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon
@@ -50,7 +50,7 @@ int numOfPages = (int) Math.ceil(numOfRITs * 1.0 / 
ritsPerPage);
 
 
 Regions in Transition
- <% numOfRITs %> region(s) in transition.
+ <% numOfRITs %> region(s) in transition.
  <%if ritStat.hasRegionsTwiceOverThreshold()  %>
  
  <%elseif ritStat.hasRegionsOverThreshold() %>

http://git-wip-us.apache.org/repos/asf/hbase/blob/6f602db5/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 3180c56..87e07b3 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,6 +215,9 @@ AssignmentManager assignmentManager = 
master.getAssignmentManager();
 or re-run HBCK in repair mode.
   
 
+<%if master.getAssignmentManager() != null %>
+  <& AssignmentManagerStatusTmpl; 
assignmentManager=master.getAssignmentManager()&>
+
 <%if 
master.getMasterCoprocessorHost().findCoprocessor("RSGroupAdminEndpoint") != 
null %>
   
 RSGroup
@@ -267,9 +270,6 @@ AssignmentManager assignmentManager = 
master.getAssignmentManager();
 Peers
 <& peerConfigs &>
 
-<%if master.getAssignmentManager() != null %>
-<& AssignmentManagerStatusTmpl; 
assignmentManager=master.getAssignmentManager()&>
-
<%else>
 
 <& BackupMasterStatusTmpl; master = master &>
@@ -534,9 +534,9 @@ AssignmentManager assignmentManager = 
master.getAssignmentManager();
 
 <% tableState.getState() %>
 <% openRegionsCount %>
-<% openingRegionsCount %>
+<%if (openingRegionsCount > 0) %> <% openingRegionsCount %> 
<%else><% openingRegionsCount %> 
 <% closedRegionsCount %>
-<% closingRegionsCount %>
+<%if (closingRegionsCount > 0) %> <% closingRegionsCount %> 
<%else><% closingRegionsCount %> 
 <% offlineRegionsCount %>
 <% failedRegionsCount %>
 <% splitRegionsCount %>

http://git-wip-us.apache.org/repos/asf/hbase/blob/6f602db5/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp
--
diff --git a/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp 
b/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp
new file mode 100644
index 000..78bc32e
--- /dev/null
+++ b/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp
@@ -0,0 +1,120 @@
+<%--
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * 

[2/2] hbase git commit: HBASE-21410 A helper page that help find all problematic regions and procedures

2018-11-08 Thread zghao
HBASE-21410 A helper page that help find all problematic regions and procedures

Signed-off-by: Guanghao Zhang 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/fa637366
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fa637366
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fa637366

Branch: refs/heads/master
Commit: fa6373660f622e7520a9f2639485cc386f18ede0
Parents: 13b4351
Author: jingyuntian 
Authored: Thu Nov 8 15:30:30 2018 +0800
Committer: Guanghao Zhang 
Committed: Fri Nov 9 14:01:49 2018 +0800

--
 .../master/AssignmentManagerStatusTmpl.jamon|   2 +-
 .../hbase/tmpl/master/MasterStatusTmpl.jamon|  10 +-
 .../resources/hbase-webapps/master/rits.jsp | 120 +++
 3 files changed, 126 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/fa637366/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon
--
diff --git 
a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon
 
b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon
index b94ba43..9c6916e 100644
--- 
a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon
+++ 
b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon
@@ -50,7 +50,7 @@ int numOfPages = (int) Math.ceil(numOfRITs * 1.0 / 
ritsPerPage);
 
 
 Regions in Transition
- <% numOfRITs %> region(s) in transition.
+ <% numOfRITs %> region(s) in transition.
  <%if ritStat.hasRegionsTwiceOverThreshold()  %>
  
  <%elseif ritStat.hasRegionsOverThreshold() %>

http://git-wip-us.apache.org/repos/asf/hbase/blob/fa637366/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 f3ce3c8..03056e1 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,6 +215,9 @@ AssignmentManager assignmentManager = 
master.getAssignmentManager();
 or re-run HBCK in repair mode.
   
 
+<%if master.getAssignmentManager() != null %>
+  <& AssignmentManagerStatusTmpl; 
assignmentManager=master.getAssignmentManager()&>
+
 <%if 
master.getMasterCoprocessorHost().findCoprocessor("RSGroupAdminEndpoint") != 
null %>
   
 RSGroup
@@ -267,9 +270,6 @@ AssignmentManager assignmentManager = 
master.getAssignmentManager();
 Peers
 <& peerConfigs &>
 
-<%if master.getAssignmentManager() != null %>
-<& AssignmentManagerStatusTmpl; 
assignmentManager=master.getAssignmentManager()&>
-
<%else>
 
 <& BackupMasterStatusTmpl; master = master &>
@@ -534,9 +534,9 @@ AssignmentManager assignmentManager = 
master.getAssignmentManager();
 
 <% tableState.getState() %>
 <% openRegionsCount %>
-<% openingRegionsCount %>
+<%if (openingRegionsCount > 0) %> <% openingRegionsCount %> 
<%else><% openingRegionsCount %> 
 <% closedRegionsCount %>
-<% closingRegionsCount %>
+<%if (closingRegionsCount > 0) %> <% closingRegionsCount %> 
<%else><% closingRegionsCount %> 
 <% offlineRegionsCount %>
 <% failedRegionsCount %>
 <% splitRegionsCount %>

http://git-wip-us.apache.org/repos/asf/hbase/blob/fa637366/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp
--
diff --git a/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp 
b/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp
new file mode 100644
index 000..78bc32e
--- /dev/null
+++ b/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp
@@ -0,0 +1,120 @@
+<%--
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *