HBASE-29596 Migrate Canary Status Jamon page back to JSP (#7390)
This is the last step of the Jamon to JSP migration: the Canary Status page.
Migrated the Jamon code to JSP as close as possible. Extracted some duplicated server link code to new java class: CanaryStatusUtil and added unit tests.
Changed the Canary Server Status page back to `/canary.jsp`. Made sure that `/canary-status` redirects to `/canary.jsp`.
Introduced a `src/main/resources/hbase-webapps/common` directory where we can place common JSP files which are used by both Master and RegionServer JSP pages. This required to adjust the JSP compiler Maven Antrun plugin a bit.
Made sure to compile Canary JSP files the same way as we do for Master and Region server JSP pages.
Removed the Jamon Maven dependencies and references to Jamon code.
Signed-off-by: Istvan Toth <stoty@apache.org>
Signed-off-by: Nihal Jain <nihaljain@apache.org>
diff --git a/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml b/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml
index 2d8e880..36b242f 100644
--- a/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml
+++ b/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml
@@ -32,7 +32,6 @@
-->
<suppressions>
<suppress checks="." files=".*/generated/.*\.java"/>
- <suppress checks="." files=".*/generated-jamon/.*\.java"/>
<suppress checks="MagicNumberCheck" files=".*/src/test/.*\.java"/>
<suppress checks="VisibilityModifier" files=".*/src/test/.*\.java"/>
<suppress checks="InterfaceIsTypeCheck" files=".*/src/main/.*\.java"/>
diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
index 3e09323..0ce3c3e 100644
--- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
@@ -1068,397 +1068,6 @@
</licenses>
</project>
</supplement>
- <supplement>
- <project>
- <groupId>org.jamon</groupId>
- <artifactId>jamon-runtime</artifactId>
- <name>Jamon runtime support classes</name>
- <url>http://www.jamon.org/</url>
-
- <licenses>
- <license>
- <url>http://www.mozilla.org/MPL/2.0</url>
- <name>Mozilla Public License Version 2.0</name>
- <distribution>repo</distribution>
- <comments>
-Mozilla Public License Version 2.0
-==================================
-
-1. Definitions
---------------
-
-1.1. "Contributor"
- means each individual or legal entity that creates, contributes to
- the creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
- means the combination of the Contributions of others (if any) used
- by a Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
- means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
- means Source Code Form to which the initial Contributor has attached
- the notice in Exhibit A, the Executable Form of such Source Code
- Form, and Modifications of such Source Code Form, in each case
- including portions thereof.
-
-1.5. "Incompatible With Secondary Licenses"
- means
-
- (a) that the initial Contributor has attached the notice described
- in Exhibit B to the Covered Software; or
-
- (b) that the Covered Software was made available under the terms of
- version 1.1 or earlier of the License, but not also under the
- terms of a Secondary License.
-
-1.6. "Executable Form"
- means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
- means a work that combines Covered Software with other material, in
- a separate file or files, that is not Covered Software.
-
-1.8. "License"
- means this document.
-
-1.9. "Licensable"
- means having the right to grant, to the maximum extent possible,
- whether at the time of the initial grant or subsequently, any and
- all of the rights conveyed by this License.
-
-1.10. "Modifications"
- means any of the following:
-
- (a) any file in Source Code Form that results from an addition to,
- deletion from, or modification of the contents of Covered
- Software; or
-
- (b) any new file in Source Code Form that contains any Covered
- Software.
-
-1.11. "Patent Claims" of a Contributor
- means any patent claim(s), including without limitation, method,
- process, and apparatus claims, in any patent Licensable by such
- Contributor that would be infringed, but for the grant of the
- License, by the making, using, selling, offering for sale, having
- made, import, or transfer of either its Contributions or its
- Contributor Version.
-
-1.12. "Secondary License"
- means either the GNU General Public License, Version 2.0, the GNU
- Lesser General Public License, Version 2.1, the GNU Affero General
- Public License, Version 3.0, or any later versions of those
- licenses.
-
-1.13. "Source Code Form"
- means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
- means an individual or a legal entity exercising rights under this
- License. For legal entities, "You" includes any entity that
- controls, is controlled by, or is under common control with You. For
- purposes of this definition, "control" means (a) the power, direct
- or indirect, to cause the direction or management of such entity,
- whether by contract or otherwise, or (b) ownership of more than
- fifty percent (50%) of the outstanding shares or beneficial
- ownership of such entity.
-
-2. License Grants and Conditions
---------------------------------
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
- Licensable by such Contributor to use, reproduce, make available,
- modify, display, perform, distribute, and otherwise exploit its
- Contributions, either on an unmodified basis, with Modifications, or
- as part of a Larger Work; and
-
-(b) under Patent Claims of such Contributor to make, use, sell, offer
- for sale, have made, import, and otherwise transfer either its
- Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution
-become effective for each Contribution on the date the Contributor first
-distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under
-this License. No additional rights or licenses will be implied from the
-distribution or licensing of Covered Software under this License.
-Notwithstanding Section 2.1(b) above, no patent license is granted by a
-Contributor:
-
-(a) for any code that a Contributor has removed from Covered Software;
- or
-
-(b) for infringements caused by: (i) Your and any other third party's
- modifications of Covered Software, or (ii) the combination of its
- Contributions with other software (except as part of its Contributor
- Version); or
-
-(c) under Patent Claims infringed by Covered Software in the absence of
- its Contributions.
-
-This License does not grant any rights in the trademarks, service marks,
-or logos of any Contributor (except as may be necessary to comply with
-the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to
-distribute the Covered Software under a subsequent version of this
-License (see Section 10.2) or under the terms of a Secondary License (if
-permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its
-Contributions are its original creation(s) or it has sufficient rights
-to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under
-applicable copyright doctrines of fair use, fair dealing, or other
-equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-in Section 2.1.
-
-3. Responsibilities
--------------------
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any
-Modifications that You create or to which You contribute, must be under
-the terms of this License. You must inform recipients that the Source
-Code Form of the Covered Software is governed by the terms of this
-License, and how they can obtain a copy of this License. You may not
-attempt to alter or restrict the recipients' rights in the Source Code
-Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-(a) such Covered Software must also be made available in Source Code
- Form, as described in Section 3.1, and You must inform recipients of
- the Executable Form how they can obtain a copy of such Source Code
- Form by reasonable means in a timely manner, at a charge no more
- than the cost of distribution to the recipient; and
-
-(b) You may distribute such Executable Form under the terms of this
- License, or sublicense it under different terms, provided that the
- license for the Executable Form does not attempt to limit or alter
- the recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice,
-provided that You also comply with the requirements of this License for
-the Covered Software. If the Larger Work is a combination of Covered
-Software with a work governed by one or more Secondary Licenses, and the
-Covered Software is not Incompatible With Secondary Licenses, this
-License permits You to additionally distribute such Covered Software
-under the terms of such Secondary License(s), so that the recipient of
-the Larger Work may, at their option, further distribute the Covered
-Software under the terms of either this License or such Secondary
-License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices
-(including copyright notices, patent notices, disclaimers of warranty,
-or limitations of liability) contained within the Source Code Form of
-the Covered Software, except that You may alter any license notices to
-the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support,
-indemnity or liability obligations to one or more recipients of Covered
-Software. However, You may do so only on Your own behalf, and not on
-behalf of any Contributor. You must make it absolutely clear that any
-such warranty, support, indemnity, or liability obligation is offered by
-You alone, and You hereby agree to indemnify every Contributor for any
-liability incurred by such Contributor as a result of warranty, support,
-indemnity or liability terms You offer. You may include additional
-disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
----------------------------------------------------
-
-If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Software due to
-statute, judicial order, or regulation then You must: (a) comply with
-the terms of this License to the maximum extent possible; and (b)
-describe the limitations and the code they affect. Such description must
-be placed in a text file included with all distributions of the Covered
-Software under this License. Except to the extent prohibited by statute
-or regulation, such description must be sufficiently detailed for a
-recipient of ordinary skill to be able to understand it.
-
-5. Termination
---------------
-
-5.1. The rights granted under this License will terminate automatically
-if You fail to comply with any of its terms. However, if You become
-compliant, then the rights granted under this License from a particular
-Contributor are reinstated (a) provisionally, unless and until such
-Contributor explicitly and finally terminates Your grants, and (b) on an
-ongoing basis, if such Contributor fails to notify You of the
-non-compliance by some reasonable means prior to 60 days after You have
-come back into compliance. Moreover, Your grants from a particular
-Contributor are reinstated on an ongoing basis if such Contributor
-notifies You of the non-compliance by some reasonable means, this is the
-first time You have received notice of non-compliance with this License
-from such Contributor, and You become compliant prior to 30 days after
-Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-infringement claim (excluding declaratory judgment actions,
-counter-claims, and cross-claims) alleging that a Contributor Version
-directly or indirectly infringes any patent, then the rights granted to
-You by any and all Contributors for the Covered Software under Section
-2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-end user license agreements (excluding distributors and resellers) which
-have been validly granted by You or Your distributors under this License
-prior to termination shall survive termination.
-
-************************************************************************
-* *
-* 6. Disclaimer of Warranty *
-* ------------------------- *
-* *
-* Covered Software is provided under this License on an "as is" *
-* basis, without warranty of any kind, either expressed, implied, or *
-* statutory, including, without limitation, warranties that the *
-* Covered Software is free of defects, merchantable, fit for a *
-* particular purpose or non-infringing. The entire risk as to the *
-* quality and performance of the Covered Software is with You. *
-* Should any Covered Software prove defective in any respect, You *
-* (not any Contributor) assume the cost of any necessary servicing, *
-* repair, or correction. This disclaimer of warranty constitutes an *
-* essential part of this License. No use of any Covered Software is *
-* authorized under this License except under this disclaimer. *
-* *
-************************************************************************
-
-************************************************************************
-* *
-* 7. Limitation of Liability *
-* -------------------------- *
-* *
-* Under no circumstances and under no legal theory, whether tort *
-* (including negligence), contract, or otherwise, shall any *
-* Contributor, or anyone who distributes Covered Software as *
-* permitted above, be liable to You for any direct, indirect, *
-* special, incidental, or consequential damages of any character *
-* including, without limitation, damages for lost profits, loss of *
-* goodwill, work stoppage, computer failure or malfunction, or any *
-* and all other commercial damages or losses, even if such party *
-* shall have been informed of the possibility of such damages. This *
-* limitation of liability shall not apply to liability for death or *
-* personal injury resulting from such party's negligence to the *
-* extent applicable law prohibits such limitation. Some *
-* jurisdictions do not allow the exclusion or limitation of *
-* incidental or consequential damages, so this exclusion and *
-* limitation may not apply to You. *
-* *
-************************************************************************
-
-8. Litigation
--------------
-
-Any litigation relating to this License may be brought only in the
-courts of a jurisdiction where the defendant maintains its principal
-place of business and such litigation shall be governed by laws of that
-jurisdiction, without reference to its conflict-of-law provisions.
-Nothing in this Section shall prevent a party's ability to bring
-cross-claims or counter-claims.
-
-9. Miscellaneous
-----------------
-
-This License represents the complete agreement concerning the subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent
-necessary to make it enforceable. Any law or regulation which provides
-that the language of a contract shall be construed against the drafter
-shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
----------------------------
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section
-10.3, no one other than the license steward has the right to modify or
-publish new versions of this License. Each version will be given a
-distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version
-of the License under which You originally received the Covered Software,
-or under the terms of any subsequent version published by the license
-steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to
-create a new license for such software, you may create and use a
-modified version of this License if you rename the license and remove
-any references to the name of the license steward (except to note that
-such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With
-Secondary Licenses under the terms of this version of the License, the
-notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
--------------------------------------------
-
- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
----------------------------------------------------------
-
- This Source Code Form is "Incompatible With Secondary Licenses", as
- defined by the Mozilla Public License, v. 2.0.
-</comments>
- </license>
- </licenses>
- </project>
- </supplement>
<!-- Category B in assembly but not server/client -->
<supplement>
<project>
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index e27ab22..295bb27 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -223,10 +223,6 @@
<artifactId>zookeeper</artifactId>
</dependency>
<dependency>
- <groupId>org.jamon</groupId>
- <artifactId>jamon-runtime</artifactId>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
@@ -479,7 +475,6 @@
<phase>generate-sources</phase>
<configuration>
<sources>
- <source>${project.build.directory}/generated-jamon</source>
<source>${project.build.directory}/generated-sources/java</source>
</sources>
</configuration>
@@ -584,27 +579,13 @@
<jspcompiler outputdir="${generated.sources}/java" package="org.apache.hadoop.hbase.generated.master" uriroot="${project.build.directory}/jsp/master" webxml="${build.webapps}/master/WEB-INF/web.xml"/>
<mkdir dir="${build.webapps}/regionserver/WEB-INF"/>
<jspcompiler outputdir="${generated.sources}/java" package="org.apache.hadoop.hbase.generated.regionserver" uriroot="${project.build.directory}/jsp/regionserver" webxml="${build.webapps}/regionserver/WEB-INF/web.xml"/>
+ <mkdir dir="${build.webapps}/canary/WEB-INF"/>
+ <jspcompiler outputdir="${generated.sources}/java" package="org.apache.hadoop.hbase.generated.canary" uriroot="${project.build.directory}/jsp/canary" webxml="${build.webapps}/canary/WEB-INF/web.xml"/>
</target>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.jamon</groupId>
- <artifactId>jamon-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>translate</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <templateSourceDir>src/main/jamon</templateSourceDir>
- <templateOutputDir>target/generated-jamon</templateOutputDir>
- </configuration>
- </execution>
- </executions>
- </plugin>
<!-- Testing plugins -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
@@ -939,22 +920,6 @@
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
- <groupId>org.jamon</groupId>
- <artifactId>jamon-maven-plugin</artifactId>
- <versionRange>[2.3.4,)</versionRange>
- <goals>
- <goal>translate</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute>
- <runOnIncremental>false</runOnIncremental>
- <runOnConfiguration>true</runOnConfiguration>
- </execute>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<versionRange>[1.6,)</versionRange>
@@ -988,31 +953,6 @@
</plugin>
</plugins>
</pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <additionalProjectnatures>
- <projectnature>org.jamon.project.jamonnature</projectnature>
- </additionalProjectnatures>
- <buildcommands>
- <buildcommand>org.jamon.project.templateBuilder</buildcommand>
- <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
- <buildcommand>org.jamon.project.markerUpdater</buildcommand>
- </buildcommands>
- <additionalConfig>
- <file>
- <name>.settings/org.jamon.prefs</name>
- <content># now
- eclipse.preferences.version=1
- templateSourceDir=src/main/jamon
- templateOutputDir=target/generated-jamon</content>
- </file>
- </additionalConfig>
- </configuration>
- </plugin>
- </plugins>
</build>
</profile>
</profiles>
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/tool/CanaryStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/tool/CanaryStatusTmpl.jamon
deleted file mode 100644
index 031f344..0000000
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/tool/CanaryStatusTmpl.jamon
+++ /dev/null
@@ -1,158 +0,0 @@
-
-<%doc>
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-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>
-RegionStdOutSink sink;
-</%args>
-<%import>
-java.util.Map;
-java.util.concurrent.atomic.LongAdder;
-org.apache.hadoop.hbase.ServerName;
-org.apache.hadoop.hbase.tool.CanaryTool.RegionStdOutSink;
-org.apache.hadoop.hbase.util.JvmVersion;
-</%import>
-
-<!--[if IE]>
-<!DOCTYPE html>
-<![endif]-->
-<?xml version="1.0" encoding="UTF-8" ?>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Canary</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <link href="/static/css/bootstrap.min.css" rel="stylesheet">
- <link href="/static/css/hbase.css" rel="stylesheet">
- <link rel="shortcut icon" href="/static/favicon.ico">
- </head>
-
- <body>
-
- <nav class="navbar navbar-expand-md navbar-light fixed-top bg-light">
- <div class="container-fluid">
- <a class="navbar-brand" href="/canary-status"><img src="/static/hbase_logo_small.png" alt="HBase Logo"/></a>
- <button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target=".navbar-collapse">
- <span class="navbar-toggler-icon"></span>
- </button>
- </div>
- </nav>
-
- <div class="container">
- <section>
- <h2>Failed Servers</h2>
- <%java>
- Map<ServerName, LongAdder> perServerFailuresCount = sink.getPerServerFailuresCount();
- </%java>
- <table class="table table-striped">
- <tr>
- <th>Server</th>
- <th>Failures Count</th>
- </tr>
- <%if (perServerFailuresCount != null && perServerFailuresCount.size() > 0)%>
- <%for Map.Entry<ServerName, LongAdder> entry : perServerFailuresCount.entrySet() %>
- <tr>
- <td><& serverNameLink ; serverName = entry.getKey() &></td>
- <td><% entry.getValue() %></td>
- </tr>
- </%for>
- </%if>
- <tr><td>Total Failed Servers: <% (perServerFailuresCount != null) ? perServerFailuresCount.size() : 0 %></td></tr>
- </table>
- </section>
- <section>
- <h2>Failed Tables</h2>
- <%java>
- Map<String, LongAdder> perTableFailuresCount = sink.getPerTableFailuresCount();
- </%java>
- <table class="table table-striped">
- <tr>
- <th>Table</th>
- <th>Failures Count</th>
- </tr>
- <%if (perTableFailuresCount != null && perTableFailuresCount.size() > 0)%>
- <%for Map.Entry<String, LongAdder> entry : perTableFailuresCount.entrySet()%>
- <tr>
- <td><% entry.getKey() %></td>
- <td><% entry.getValue() %></td>
- </tr>
- </%for>
- </%if>
- <tr><td>Total Failed Tables: <% (perTableFailuresCount != null) ? perTableFailuresCount.size() : 0 %></td></tr>
- </table>
- </section>
-
- <section>
- <h2>Software Attributes</h2>
- <table id="attributes_table" class="table table-striped">
- <tr>
- <th>Attribute Name</th>
- <th>Value</th>
- <th>Description</th>
- </tr>
- <tr>
- <td>JVM Version</td>
- <td><% JvmVersion.getVersion() %></td>
- <td>JVM vendor and version</td>
- </tr>
- <tr>
- <td>HBase Version</td>
- <td><% org.apache.hadoop.hbase.util.VersionInfo.getVersion() %>, r<% org.apache.hadoop.hbase.util.VersionInfo.getRevision() %></td><td>HBase version and revision</td>
- </tr>
- <tr>
- <td>HBase Compiled</td>
- <td><% org.apache.hadoop.hbase.util.VersionInfo.getDate() %>, <% org.apache.hadoop.hbase.util.VersionInfo.getUser() %></td>
- <td>When HBase version was compiled and by whom</td>
- </tr>
- <tr>
- <td>Hadoop Version</td>
- <td><% org.apache.hadoop.util.VersionInfo.getVersion() %>, r<% org.apache.hadoop.util.VersionInfo.getRevision() %></td>
- <td>Hadoop version and revision</td>
- </tr>
- <tr>
- <td>Hadoop Compiled</td>
- <td><% org.apache.hadoop.util.VersionInfo.getDate() %>, <% org.apache.hadoop.util.VersionInfo.getUser() %></td>
- <td>When Hadoop version was compiled and by whom</td>
- </tr>
- </table>
- </section>
- </div>
- </div> <!-- /container -->
-
- <script src="/static/js/jquery.min.js" type="text/javascript"></script>
- <script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
- <script src="/static/js/tab.js" type="text/javascript"></script>
- </body>
-</html>
-
-<%def serverNameLink>
- <%args>
- ServerName serverName;
- </%args>
- <%java>
- int infoPort = serverName.getPort() + 1;
- String url = "//" + serverName.getHostname() + ":" + infoPort + "/";
- </%java>
-
- <%if (infoPort > 0) %>
- <a href="<% url %>"><% serverName.getServerName() %></a>
- <%else>
- <% serverName.getServerName() %>
- </%if>
-</%def>
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/CanaryStatusServlet.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/CanaryStatusServlet.java
index 42e749f..c013fb4 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/CanaryStatusServlet.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/CanaryStatusServlet.java
@@ -18,29 +18,19 @@
package org.apache.hadoop.hbase.tool;
import java.io.IOException;
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.hadoop.hbase.tmpl.tool.CanaryStatusTmpl;
import org.apache.yetus.audience.InterfaceAudience;
+/**
+ * Only kept for redirecting to canary.jsp.
+ */
@InterfaceAudience.Private
public class CanaryStatusServlet extends HttpServlet {
+
@Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
- CanaryTool.RegionStdOutSink sink =
- (CanaryTool.RegionStdOutSink) getServletContext().getAttribute("sink");
- if (sink == null) {
- throw new ServletException(
- "RegionStdOutSink is null! The CanaryTool's InfoServer is not initialized correctly");
- }
-
- resp.setContentType("text/html");
-
- CanaryStatusTmpl tmpl = new CanaryStatusTmpl();
- tmpl.render(resp.getWriter(), sink);
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+ resp.sendRedirect(req.getContextPath() + "/canary.jsp");
}
-
}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/CanaryStatusUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/CanaryStatusUtil.java
new file mode 100644
index 0000000..6e9f94f
--- /dev/null
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/CanaryStatusUtil.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package org.apache.hadoop.hbase.util;
+
+import org.apache.hadoop.hbase.ServerName;
+import org.apache.yetus.audience.InterfaceAudience;
+
+/**
+ * Utility used by the web UI JSP pages.
+ */
+@InterfaceAudience.Private
+public final class CanaryStatusUtil {
+
+ private CanaryStatusUtil() {
+ // Do not instantiate.
+ }
+
+ public static String serverNameLink(ServerName serverName) {
+ int infoPort = serverName.getPort() + 1;
+ String url = "//" + serverName.getHostname() + ":" + infoPort + "/";
+ if (infoPort > 0) {
+ return "<a href=\"" + url + "\">" + serverName.getServerName() + "</a>";
+ } else {
+ return serverName.getServerName();
+ }
+ }
+}
diff --git a/hbase-server/src/main/resources/hbase-webapps/canary/canary.jsp b/hbase-server/src/main/resources/hbase-webapps/canary/canary.jsp
index 2648ddd..ac6ec9e 100644
--- a/hbase-server/src/main/resources/hbase-webapps/canary/canary.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/canary/canary.jsp
@@ -17,4 +17,134 @@
* limitations under the License.
*/
--%>
-<meta HTTP-EQUIV="REFRESH" content="0;url=/canary-status"/>
+<%@ page contentType="text/html;charset=UTF-8"
+ import="java.util.*"
+ import="org.apache.hadoop.hbase.ServerName"
+ import="org.apache.hadoop.hbase.tool.CanaryTool"
+ import="java.util.concurrent.atomic.LongAdder"
+ import="org.apache.hadoop.hbase.util.JvmVersion"
+ import="static org.apache.hadoop.hbase.util.CanaryStatusUtil.serverNameLink" %>
+<%
+ CanaryTool.RegionStdOutSink sink =
+ (CanaryTool.RegionStdOutSink) getServletContext().getAttribute("sink");
+ if (sink == null) {
+ throw new ServletException(
+ "RegionStdOutSink is null! The CanaryTool's InfoServer is not initialized correctly");
+ }
+%>
+<!DOCTYPE html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta charset="utf-8">
+ <title>Canary</title>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta name="description" content="">
+ <meta name="author" content="">
+
+ <link href="/static/css/bootstrap.min.css" rel="stylesheet">
+ <link href="/static/css/hbase.css" rel="stylesheet">
+ <link rel="shortcut icon" href="/static/favicon.ico">
+</head>
+
+<body>
+
+ <nav class="navbar navbar-expand-md navbar-light fixed-top bg-light">
+ <div class="container-fluid">
+ <a class="navbar-brand" href="/canary.jsp"><img src="/static/hbase_logo_small.png" alt="HBase Logo"/></a>
+ <button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target=".navbar-collapse">
+ <span class="navbar-toggler-icon"></span>
+ </button>
+ </div>
+ </nav>
+
+ <div class="container">
+
+ <section>
+ <h2>Failed Servers</h2>
+ <%
+ Map<ServerName, LongAdder> perServerFailuresCount = sink.getPerServerFailuresCount();
+ %>
+ <table class="table table-striped">
+ <tr>
+ <th>Server</th>
+ <th>Failures Count</th>
+ </tr>
+ <% if (perServerFailuresCount != null && perServerFailuresCount.size() > 0) {
+ for (Map.Entry<ServerName, LongAdder> entry : perServerFailuresCount.entrySet()) { %>
+ <tr>
+ <td><%= serverNameLink(entry.getKey()) %></td>
+ <td><%= entry.getValue() %></td>
+ </tr>
+ <%
+ }
+ } %>
+ <tr><td>Total Failed Servers: <%= (perServerFailuresCount != null) ? perServerFailuresCount.size() : 0 %></td></tr>
+ </table>
+ </section>
+
+ <section>
+ <h2>Failed Tables</h2>
+ <%
+ Map<String, LongAdder> perTableFailuresCount = sink.getPerTableFailuresCount();
+ %>
+ <table class="table table-striped">
+ <tr>
+ <th>Table</th>
+ <th>Failures Count</th>
+ </tr>
+ <% if (perTableFailuresCount != null && perTableFailuresCount.size() > 0) {
+ for (Map.Entry<String, LongAdder> entry : perTableFailuresCount.entrySet()) { %>
+ <tr>
+ <td><%= entry.getKey() %></td>
+ <td><%= entry.getValue() %></td>
+ </tr>
+ <% } %>
+ <% } %>
+ <tr><td>Total Failed Tables: <%= (perTableFailuresCount != null) ? perTableFailuresCount.size() : 0 %></td></tr>
+ </table>
+ </section>
+
+ <section>
+ <h2>Software Attributes</h2>
+ <table id="attributes_table" class="table table-striped">
+ <tr>
+ <th>Attribute Name</th>
+ <th>Value</th>
+ <th>Description</th>
+ </tr>
+ <tr>
+ <td>JVM Version</td>
+ <td><%= JvmVersion.getVersion() %></td>
+ <td>JVM vendor and version</td>
+ </tr>
+ <tr>
+ <td>HBase Version</td>
+ <td><%= org.apache.hadoop.hbase.util.VersionInfo.getVersion() %>, r<%= org.apache.hadoop.hbase.util.VersionInfo.getRevision() %></td><td>HBase version and revision</td>
+ </tr>
+ <tr>
+ <td>HBase Compiled</td>
+ <td><%= org.apache.hadoop.hbase.util.VersionInfo.getDate() %>, <%= org.apache.hadoop.hbase.util.VersionInfo.getUser() %></td>
+ <td>When HBase version was compiled and by whom</td>
+ </tr>
+ <tr>
+ <td>Hadoop Version</td>
+ <td><%= org.apache.hadoop.util.VersionInfo.getVersion() %>, r<%= org.apache.hadoop.util.VersionInfo.getRevision() %></td>
+ <td>Hadoop version and revision</td>
+ </tr>
+ <tr>
+ <td>Hadoop Compiled</td>
+ <td><%= org.apache.hadoop.util.VersionInfo.getDate() %>, <%= org.apache.hadoop.util.VersionInfo.getUser() %></td>
+ <td>When Hadoop version was compiled and by whom</td>
+ </tr>
+ </table>
+ </section>
+
+ </div> <!-- /container -->
+
+ <script src="/static/js/jquery.min.js" type="text/javascript"></script>
+ <script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
+ <script src="/static/js/tab.js" type="text/javascript"></script>
+</body>
+
+</html>
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryStatusServlet.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryStatusServlet.java
deleted file mode 100644
index d710ad7..0000000
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryStatusServlet.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-package org.apache.hadoop.hbase.tool;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.ServerName;
-import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.client.RegionInfo;
-import org.apache.hadoop.hbase.client.RegionInfoBuilder;
-import org.apache.hadoop.hbase.testclassification.SmallTests;
-import org.apache.hadoop.hbase.tmpl.tool.CanaryStatusTmpl;
-import org.junit.Assert;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-@Category({ SmallTests.class })
-public class TestCanaryStatusServlet {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestCanaryStatusServlet.class);
-
- @Test
- public void testFailures() throws IOException {
- CanaryTool.RegionStdOutSink regionStdOutSink = new CanaryTool.RegionStdOutSink();
-
- ServerName serverName1 = ServerName.valueOf("staging-st04.server:22600", 1584180761635L);
- TableName fakeTableName1 = TableName.valueOf("fakeTableName1");
- RegionInfo regionInfo1 = RegionInfoBuilder.newBuilder(fakeTableName1).build();
-
- ServerName serverName2 = ServerName.valueOf("staging-st05.server:22600", 1584180761636L);
- TableName fakeTableName2 = TableName.valueOf("fakeTableName2");
- RegionInfo regionInfo2 = RegionInfoBuilder.newBuilder(fakeTableName2).build();
-
- regionStdOutSink.publishReadFailure(serverName1, regionInfo1, new IOException());
- regionStdOutSink.publishWriteFailure(serverName2, regionInfo2, new IOException());
- CanaryStatusTmpl tmpl = new CanaryStatusTmpl();
- StringWriter renderResultWriter = new StringWriter();
- tmpl.render(renderResultWriter, regionStdOutSink);
- String renderResult = renderResultWriter.toString();
- Assert.assertTrue(renderResult.contains("staging-st04.server,22600"));
- Assert.assertTrue(renderResult.contains("fakeTableName1"));
- Assert.assertTrue(renderResult.contains("staging-st05.server,22600"));
- Assert.assertTrue(renderResult.contains("fakeTableName2"));
-
- }
-
- @Test
- public void testReadFailuresOnly() throws IOException {
- CanaryTool.RegionStdOutSink regionStdOutSink = new CanaryTool.RegionStdOutSink();
-
- ServerName serverName1 = ServerName.valueOf("staging-st04.server:22600", 1584180761635L);
- TableName fakeTableName1 = TableName.valueOf("fakeTableName1");
- RegionInfo regionInfo1 = RegionInfoBuilder.newBuilder(fakeTableName1).build();
-
- regionStdOutSink.publishReadFailure(serverName1, regionInfo1, new IOException());
- CanaryStatusTmpl tmpl = new CanaryStatusTmpl();
- StringWriter renderResultWriter = new StringWriter();
- tmpl.render(renderResultWriter, regionStdOutSink);
- String renderResult = renderResultWriter.toString();
- Assert.assertTrue(renderResult.contains("staging-st04.server,22600"));
- Assert.assertTrue(renderResult.contains("fakeTableName1"));
- }
-
- @Test
- public void testWriteFailuresOnly() throws IOException {
- CanaryTool.RegionStdOutSink regionStdOutSink = new CanaryTool.RegionStdOutSink();
-
- ServerName serverName2 = ServerName.valueOf("staging-st05.server:22600", 1584180761636L);
- TableName fakeTableName2 = TableName.valueOf("fakeTableName2");
- RegionInfo regionInfo2 = RegionInfoBuilder.newBuilder(fakeTableName2).build();
-
- regionStdOutSink.publishReadFailure(serverName2, regionInfo2, new IOException());
- CanaryStatusTmpl tmpl = new CanaryStatusTmpl();
- StringWriter renderResultWriter = new StringWriter();
- tmpl.render(renderResultWriter, regionStdOutSink);
- String renderResult = renderResultWriter.toString();
- Assert.assertTrue(renderResult.contains("staging-st05.server,22600"));
- Assert.assertTrue(renderResult.contains("fakeTableName2"));
-
- }
-
- @Test
- public void testNoFailures() throws IOException {
- CanaryTool.RegionStdOutSink regionStdOutSink = new CanaryTool.RegionStdOutSink();
- CanaryStatusTmpl tmpl = new CanaryStatusTmpl();
- StringWriter renderResultWriter = new StringWriter();
- tmpl.render(renderResultWriter, regionStdOutSink);
- String renderResult = renderResultWriter.toString();
- Assert.assertTrue(renderResult.contains("Total Failed Servers: 0"));
- Assert.assertTrue(renderResult.contains("Total Failed Tables: 0"));
- }
-
-}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java
index 2b1194b..799247e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.hbase.tool;
import static org.apache.hadoop.hbase.regionserver.TestRegionServerNoMaster.closeRegion;
+import static org.apache.hadoop.hbase.tool.CanaryTool.HBASE_CANARY_INFO_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
@@ -35,11 +36,20 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.LongAdder;
+import org.apache.commons.io.IOUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseConfiguration;
@@ -54,6 +64,8 @@
import org.apache.hadoop.hbase.regionserver.HRegionServer;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.JvmVersion;
+import org.apache.hadoop.hbase.util.VersionInfo;
import org.apache.hadoop.util.ToolRunner;
import org.junit.After;
import org.junit.Before;
@@ -437,4 +449,137 @@
HConstants.DEFAULT_ZOOKEEPER_ZNODE_PARENT);
verify(sink, atLeastOnce()).publishReadTiming(eq(baseZnode), eq(hostPort), anyLong());
}
+
+ @Test
+ public void testWebUI() throws Exception {
+ CanaryTool.RegionStdOutSink sink = mock(CanaryTool.RegionStdOutSink.class);
+
+ Configuration configuration = HBaseConfiguration.create(testingUtility.getConfiguration());
+ int infoPort = 16666;
+ configuration.setInt(HBASE_CANARY_INFO_PORT, infoPort);
+
+ ExecutorService executorService = startCanaryToolInBackground(sink, configuration);
+
+ // Test that old canary status page URL redirects to JSP
+ URL oldPageUrl = new URL("http://localhost:" + infoPort + "/canary-status");
+ String oldPageContent = getPageContent(oldPageUrl);
+ assertTrue("expected=canary.jsp, content=" + oldPageContent,
+ oldPageContent.contains("canary.jsp"));
+
+ // Test web UI page content
+ URL url = new URL("http://localhost:" + infoPort + "/canary.jsp");
+ String page = getPageContent(url);
+
+ assertTrue("Page should contain page title.", page.contains("<title>Canary</title>"));
+
+ assertTrue("Page should contain Failed Servers header.",
+ page.contains("<h2>Failed Servers</h2>"));
+ assertTrue("Page should have zero Failed Servers.",
+ page.contains("<td>Total Failed Servers: 0</td>"));
+
+ assertTrue("Page should contain Failed Tables header.",
+ page.contains("<h2>Failed Tables</h2>"));
+ assertTrue("Page should have zero Failed Tables.",
+ page.contains("<td>Total Failed Tables: 0</td>"));
+
+ assertTrue("Page should contain Software Attributes header.",
+ page.contains("<h2>Software Attributes</h2>"));
+ assertTrue("Page should contain JVM version.",
+ page.contains("<td>" + JvmVersion.getVersion() + "</td>"));
+ assertTrue("Page should contain HBase version.", page
+ .contains("<td>" + VersionInfo.getVersion() + ", r" + VersionInfo.getRevision() + "</td>"));
+
+ // Stop Canary tool daemon
+ executorService.shutdown();
+ }
+
+ @Test
+ public void testWebUIWithFailures() throws Exception {
+ CanaryTool.RegionStdOutSink sink = mock(CanaryTool.RegionStdOutSink.class);
+
+ // Simulate a failed server
+ ServerName sn1 = ServerName.parseServerName("asf903.gq1.ygridcore.net,52690,1517835491385");
+ ConcurrentMap<ServerName, LongAdder> servers = new ConcurrentHashMap<>();
+ servers.put(sn1, new LongAdder());
+ when(sink.getPerServerFailuresCount()).thenReturn(servers);
+
+ // Simulate failed tables
+ ConcurrentMap<String, LongAdder> tables = new ConcurrentHashMap<>();
+ tables.put("awesome-table", new LongAdder());
+ tables.put("awesome-table-two", new LongAdder());
+ when(sink.getPerTableFailuresCount()).thenReturn(tables);
+
+ Configuration configuration = HBaseConfiguration.create(testingUtility.getConfiguration());
+ int infoPort = 16667;
+ configuration.setInt(HBASE_CANARY_INFO_PORT, infoPort);
+
+ ExecutorService executorService = startCanaryToolInBackground(sink, configuration);
+
+ URL url = new URL("http://localhost:" + infoPort + "/canary.jsp");
+ String page = getPageContent(url);
+
+ assertTrue("Page should contain page title.", page.contains("<title>Canary</title>"));
+
+ assertTrue("Page should contain Failed Servers header.",
+ page.contains("<h2>Failed Servers</h2>"));
+ assertTrue("Page should contain the failed server link.", page.contains(
+ "<a href=\"//asf903.gq1.ygridcore.net:52691/\">asf903.gq1.ygridcore.net,52690,1517835491385</a>"));
+ assertTrue("Page should summarize 1 failed server.",
+ page.contains("<td>Total Failed Servers: 1</td>"));
+
+ assertTrue("Page should contain Failed Tables header.",
+ page.contains("<h2>Failed Tables</h2>"));
+ assertTrue("Page should contain awesome-table as failed table link.",
+ page.contains("<td>awesome-table</td>"));
+ assertTrue("Page should contain awesome-table-two as failed table link.",
+ page.contains("<td>awesome-table-two</td>"));
+ assertTrue("Page should summarize 2 failed tables.",
+ page.contains("<td>Total Failed Tables: 2</td>"));
+
+ // Stop Canary tool daemon
+ executorService.shutdown();
+ }
+
+ private static ExecutorService startCanaryToolInBackground(CanaryTool.RegionStdOutSink sink,
+ Configuration configuration) {
+ ExecutorService canaryExecutor = new ScheduledThreadPoolExecutor(1);
+ CanaryTool canary = new CanaryTool(canaryExecutor, sink);
+ String[] args = { "-daemon", "-interval", "5", "-f", "false" };
+
+ // Run the Canary CLI tool in another thread otherwise it would block the unit test thread
+ // and we could not examine the web UI page.
+ ExecutorService executorService = new ScheduledThreadPoolExecutor(1);
+ executorService.submit(() -> ToolRunner.run(configuration, canary, args));
+ return executorService;
+ }
+
+ private String getPageContent(URL url) throws IOException, InterruptedException {
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+
+ boolean success = false;
+ for (int i = 1; i <= 5; i++) {
+ try {
+ conn.connect();
+ if (
+ conn.getResponseCode() == 200 && "text/html;charset=utf-8".equals(conn.getContentType())
+ ) {
+ success = true;
+ break;
+ }
+ } catch (IOException e) {
+ // ignore connection error as we retry.
+ }
+
+ // Wait a bit for the Canary web UI to come up
+ TimeUnit.MILLISECONDS.sleep(100);
+ }
+
+ if (success) {
+ try (InputStream in = conn.getInputStream()) {
+ return IOUtils.toString(in, StandardCharsets.UTF_8);
+ }
+ } else {
+ throw new IllegalStateException("Could not get Canary status page.");
+ }
+ }
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCanaryStatusUtil.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCanaryStatusUtil.java
new file mode 100644
index 0000000..56ebd88
--- /dev/null
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCanaryStatusUtil.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package org.apache.hadoop.hbase.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+
+import org.apache.hadoop.hbase.ServerName;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+@Tag(MiscTests.TAG)
+@Tag(SmallTests.TAG)
+public class TestCanaryStatusUtil {
+
+ static final ServerName FAKE_HOST = ServerName.valueOf("fakehost", 12345, 1234567890);
+
+ @Test
+ public void testServerNameLink() {
+ String link = CanaryStatusUtil.serverNameLink(FAKE_HOST);
+
+ assertNotNull(link);
+ assertEquals("<a href=\"//fakehost:12346/\">fakehost,12345,1234567890</a>", link);
+ }
+
+ @Test
+ public void testServerNameLinkNoInfoPort() {
+ ServerName serverName = mock(ServerName.class);
+ doReturn(-1).when(serverName).getPort();
+ doReturn("fakehost,12345,1234567890").when(serverName).getServerName();
+
+ String link = CanaryStatusUtil.serverNameLink(serverName);
+
+ assertNotNull(link);
+ assertEquals("fakehost,12345,1234567890", link);
+ }
+}
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index c1e43ea..33d7ec6 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -290,10 +290,6 @@
<shadedPattern>${shaded.prefix}.org.iq80</shadedPattern>
</relocation>
<relocation>
- <pattern>org.jamon</pattern>
- <shadedPattern>${shaded.prefix}.org.jamon</shadedPattern>
- </relocation>
- <relocation>
<pattern>org.jets3t</pattern>
<shadedPattern>${shaded.prefix}.org.jets3t</shadedPattern>
</relocation>
diff --git a/hbase-zookeeper/pom.xml b/hbase-zookeeper/pom.xml
index e67e052..81c61df 100644
--- a/hbase-zookeeper/pom.xml
+++ b/hbase-zookeeper/pom.xml
@@ -362,23 +362,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<configuration>
- <additionalProjectnatures>
- <projectnature>org.jamon.project.jamonnature</projectnature>
- </additionalProjectnatures>
<buildcommands>
- <buildcommand>org.jamon.project.templateBuilder</buildcommand>
<buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
- <buildcommand>org.jamon.project.markerUpdater</buildcommand>
</buildcommands>
- <additionalConfig>
- <file>
- <name>.settings/org.jamon.prefs</name>
- <content># now
- eclipse.preferences.version=1
- templateSourceDir=src/main/jamon
- templateOutputDir=target/generated-jamon</content>
- </file>
- </additionalConfig>
</configuration>
</plugin>
</plugins>
diff --git a/pom.xml b/pom.xml
index 29028f8..5304f4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -918,7 +918,6 @@
<jline.version>2.11</jline.version>
<slf4j.version>1.7.30</slf4j.version>
<clover.version>4.0.3</clover.version>
- <jamon-runtime.version>2.4.1</jamon-runtime.version>
<jettison.version>1.5.4</jettison.version>
<!--Make sure these joni/jcodings are compatible with the versions used by jruby-->
<joni.version>2.2.5</joni.version>
@@ -938,7 +937,6 @@
<checkstyle.version>11.0.1</checkstyle.version>
<exec.maven.version>3.1.0</exec.maven.version>
<error-prone.version>2.41.0</error-prone.version>
- <jamon.plugin.version>2.4.2</jamon.plugin.version>
<lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
<maven.antrun.version>1.8</maven.antrun.version>
<maven.bundle.version>3.3.0</maven.bundle.version>
@@ -1619,11 +1617,6 @@
<artifactId>jackson-databind</artifactId>
<version>${jackson.databind.version}</version>
</dependency>
- <dependency>
- <groupId>org.jamon</groupId>
- <artifactId>jamon-runtime</artifactId>
- <version>${jamon-runtime.version}</version>
- </dependency>
<!-- REST dependencies -->
<dependency>
<groupId>javax.servlet</groupId>
@@ -2043,11 +2036,6 @@
<artifactId>maven-antrun-plugin</artifactId>
<version>${maven.antrun.version}</version>
</plugin>
- <plugin>
- <groupId>org.jamon</groupId>
- <artifactId>jamon-maven-plugin</artifactId>
- <version>${jamon.plugin.version}</version>
- </plugin>
<!-- Make a jar and put the sources in the jar.
In the parent pom, so submodules will do the right thing. -->
<plugin>
diff --git a/src/main/asciidoc/_chapters/developer.adoc b/src/main/asciidoc/_chapters/developer.adoc
index 69773af..a4558fb 100644
--- a/src/main/asciidoc/_chapters/developer.adoc
+++ b/src/main/asciidoc/_chapters/developer.adoc
@@ -214,7 +214,7 @@
If you install +m2eclipse+ and import HBase in your workspace, do the following to fix your eclipse Build Path.
. Remove _target_ folder
-. Add _target/generated-jamon_ and _target/generated-sources/java_ folders.
+. Add _target/generated-sources/java_ folder.
. Remove from your Build Path the exclusions on the _src/main/resources_ and _src/test/resources_ to avoid error message in the console, such as the following:
+
----
