From 9343f8ff11cf0326d908d05008e3539a42835e73 Mon Sep 17 00:00:00 2001 From: Nick Dimiduk Date: Mon, 6 Jun 2022 15:37:21 +0200 Subject: [PATCH] Revert "HBASE-27066 The Region Visualizer display failed (#4472)" This reverts commit 5c116d239f4fbfdb8ef9c4d945b2c1a9ad6c416e. --- .../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 &>

Peers

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. -<%args> -HMaster master; - -<%import> -org.apache.hadoop.hbase.master.HMaster; -org.apache.hadoop.hbase.ServerName; -org.apache.hbase.thirdparty.com.google.common.base.Preconditions; - - -<%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(); - @@ -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: [