You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2022/05/29 18:58:10 UTC
[hbase] branch branch-2.5 updated: HBASE-27066 The Region Visualizer display failed (#4472)
This is an automated email from the ASF dual-hosted git repository.
apurtell pushed a commit to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.5 by this push:
new 8b9df125a3 HBASE-27066 The Region Visualizer display failed (#4472)
8b9df125a3 is described below
commit 8b9df125a365d2b048fa9a98719197cbb9d4b7bd
Author: litao <to...@gmail.com>
AuthorDate: Mon May 30 02:53:50 2022 +0800
HBASE-27066 The Region Visualizer display failed (#4472)
Signed-off-by: Andrew Purtell <ap...@apache.org>
---
.../hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon | 2 +-
.../hadoop/hbase/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 5582532a95..09952a274d 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 e04a81147c..b2d204f797 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.
</%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>
<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 +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: [