From 63093caa49982269a425dc270a1dcb237f8f6e7a Mon Sep 17 00:00:00 2001
From: tom lee <tomleescut@gmail.com>
Date: Fri, 27 May 2022 14:25:15 +0800
Subject: [PATCH 1/2] HBASE-27066 The Region Visualizer display failed

---
 .../hbase/tmpl/master/MasterStatusTmpl.jamon     |  2 +-
 .../hbase/tmpl/master/RegionVisualizerTmpl.jamon | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

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 c55013dd67b6..226fd495f0cd 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
@@ -278,7 +278,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
         </section>
         <section>
             <h2><a name="region_visualizer"></a>Region Visualizer</h2>
-            <& RegionVisualizerTmpl &>
+            <& RegionVisualizerTmpl; master = master &>
         </section>
         <section>
             <h2><a name="peers">Peers</a></h2>
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionVisualizerTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionVisualizerTmpl.jamon
index e04a81147c08..2f69bfdf0aae 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionVisualizerTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionVisualizerTmpl.jamon
@@ -16,6 +16,20 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 </%doc>
+<%args>
+HMaster master;
+</%args>
+<%import>
+org.apache.hadoop.hbase.master.HMaster;
+org.apache.hadoop.hbase.ServerName;
+</%import>
+
+<%java>
+ServerName active_master = master.getActiveMaster().orElse(null);
+assert active_master != null : "Failed to retrieve active master's ServerName!";
+String activeHostname = active_master.getHostname();
+int activeInfoPort = master.getActiveMasterInfoPort();
+</%java>
 
     <script type="text/javascript" src="/static/js/vega@5.19.1.min.js"></script>
     <script type="text/javascript" src="/static/js/vega-lite@5.0.0.min.js"></script>
@@ -29,7 +43,7 @@ limitations under the License.
           description: 'Total `storefileSize` per Region Server',
           data: {
             name: 'region_info',
-            url: 'http://localhost:16010/api/v1/admin/cluster_metrics/live_servers',
+            url: 'http://<% activeHostname %>:<% activeInfoPort %>/api/v1/admin/cluster_metrics/live_servers',
             format: { type: 'json', property: 'data' }
           },
           transform: [

From 404e0ed72fd892b581e72655cc7382c70568e7a1 Mon Sep 17 00:00:00 2001
From: tom lee <tomleescut@gmail.com>
Date: Sun, 29 May 2022 11:45:09 +0800
Subject: [PATCH 2/2] replace assert with Preconditions.checkState

---
 .../apache/hadoop/hbase/tmpl/master/RegionVisualizerTmpl.jamon | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionVisualizerTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionVisualizerTmpl.jamon
index 2f69bfdf0aae..b2d204f797a5 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionVisualizerTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionVisualizerTmpl.jamon
@@ -22,11 +22,12 @@ HMaster master;
 <%import>
 org.apache.hadoop.hbase.master.HMaster;
 org.apache.hadoop.hbase.ServerName;
+org.apache.hbase.thirdparty.com.google.common.base.Preconditions;
 </%import>
 
 <%java>
 ServerName active_master = master.getActiveMaster().orElse(null);
-assert active_master != null : "Failed to retrieve active master's ServerName!";
+Preconditions.checkState(active_master != null, "Failed to retrieve active master's ServerName!");
 String activeHostname = active_master.getHostname();
 int activeInfoPort = master.getActiveMasterInfoPort();
 </%java>