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 11:09:44 UTC
[hbase] branch branch-2.5 updated (5cc614f23f9 -> 7ead4b1617f)
This is an automated email from the ASF dual-hosted git repository.
ndimiduk pushed a change to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git
from 5cc614f23f9 HBASE-27093 AsyncNonMetaRegionLocator：put Complete CompletableFuture outside lock block (#4496)
new d24f4ce2f0e Revert "HBASE-27066 The Region Visualizer display failed (#4472)"
new 7ead4b1617f HBASE-27066 The Region Visualizer display failed
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon | 2 +-
.../hadoop/hbase/tmpl/master/RegionVisualizerTmpl.jamon | 17 +----------------
2 files changed, 2 insertions(+), 17 deletions(-)
[hbase] 01/02: Revert "HBASE-27066 The Region Visualizer display failed (#4472)"
Posted by nd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ndimiduk pushed a commit to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit d24f4ce2f0e4ee4cf36b623001403b55d27e3a00
Author: Nick Dimiduk <nd...@apache.org>
AuthorDate: Thu Jun 9 12:59:45 2022 +0200
Revert "HBASE-27066 The Region Visualizer display failed (#4472)"
This reverts commit 8b9df125a365d2b048fa9a98719197cbb9d4b7bd.
---
.../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 09952a274dc..5582532a95c 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: [
[hbase] 02/02: HBASE-27066 The Region Visualizer display failed
Posted by nd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ndimiduk pushed a commit to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 7ead4b1617f30fddebda4e8936a3b03d6b590147
Author: Nick Dimiduk <nd...@apache.org>
AuthorDate: Mon Jun 6 16:12:05 2022 +0200
HBASE-27066 The Region Visualizer display failed
Reviewed-by: litao <to...@gmail.com>
---
.../org/apache/hadoop/hbase/tmpl/master/RegionVisualizerTmpl.jamon | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 e04a81147c0..582125b889e 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
@@ -29,7 +29,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: '/api/v1/admin/cluster_metrics/live_servers',
format: { type: 'json', property: 'data' }
},
transform: [