From a400a66de7109637f1efb3ef3862b03ce0d70f9f Mon Sep 17 00:00:00 2001 From: litao Date: Mon, 30 May 2022 02:53:50 +0800 Subject: [PATCH] HBASE-27066 The Region Visualizer display failed (#4472) Signed-off-by: Andrew Purtell --- .../hbase/tmpl/master/MasterStatusTmpl.jamon | 2 +- .../tmpl/master/RegionVisualizerTmpl.jamon | 17 ++++++++++++++++- 2 files changed, 17 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();

Region Visualizer

- <& RegionVisualizerTmpl &> + <& RegionVisualizerTmpl; master = master &>

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 e04a81147c08..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 @@ -16,6 +16,21 @@ 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(); + @@ -29,7 +44,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: [