From cca17335aa325fca31f450af8647d6237a9da148 Mon Sep 17 00:00:00 2001
From: wenwj0 <36262341+wenwj0@users.noreply.github.com>
Date: Tue, 14 Jun 2022 14:23:27 +0800
Subject: [PATCH] Revert "HBASE-27066 The Region Visualizer display failed
(#4472)"
This reverts commit a400a66de7109637f1efb3ef3862b03ce0d70f9f.
---
.../hbase/tmpl/master/MasterStatusTmpl.jamon | 2 +-
.../tmpl/master/RegionVisualizerTmpl.jamon | 17 +----------------
2 files changed, 2 insertions(+), 17 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 226fd495f0cd..c55013dd67b6 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();
Region Visualizer
- <& RegionVisualizerTmpl; master = master &>
+ <& RegionVisualizerTmpl &>
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 b2d204f797a5..e04a81147c08 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,21 +16,6 @@ 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;
-org.apache.hbase.thirdparty.com.google.common.base.Preconditions;
-%import>
-
-<%java>
-ServerName active_master = master.getActiveMaster().orElse(null);
-Preconditions.checkState(active_master != null, "Failed to retrieve active master's ServerName!");
-String activeHostname = active_master.getHostname();
-int activeInfoPort = master.getActiveMasterInfoPort();
-%java>
@@ -44,7 +29,7 @@ int activeInfoPort = master.getActiveMasterInfoPort();
description: 'Total `storefileSize` per Region Server',
data: {
name: 'region_info',
- url: 'http://<% activeHostname %>:<% activeInfoPort %>/api/v1/admin/cluster_metrics/live_servers',
+ url: 'http://localhost:16010/api/v1/admin/cluster_metrics/live_servers',
format: { type: 'json', property: 'data' }
},
transform: [