You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nd...@apache.org on 2022/06/09 10:56:47 UTC

[hbase] 01/02: Revert "HBASE-27066 The Region Visualizer display failed (#4472)"

This is an automated email from the ASF dual-hosted git repository.

ndimiduk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit 02cc63e524cd80ef91ed9eadc8e39e7b6fba9168
Author: Nick Dimiduk <nd...@apache.org>
AuthorDate: Mon Jun 6 15:37:21 2022 +0200

    Revert "HBASE-27066 The Region Visualizer display failed (#4472)"
    
    This reverts commit 5c116d239f4fbfdb8ef9c4d945b2c1a9ad6c416e.
---
 .../hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon     |  2 +-
 .../hadoop/hbase/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 226fd495f0c..c55013dd67b 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; master = master &>
+            <& RegionVisualizerTmpl &>
         </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 b2d204f797a..e04a81147c0 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>
 
     <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>
@@ -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: [