Skip to content

Conversation

@PDavid
Copy link
Contributor

@PDavid PDavid commented Dec 3, 2025

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 [email protected]
Signed-off-by: Nihal Jain [email protected]
(cherry picked from commit 4ba9b46)

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 <[email protected]>
Signed-off-by: Nihal Jain <[email protected]>
(cherry picked from commit 4ba9b46)
@PDavid PDavid self-assigned this Dec 3, 2025
@PDavid PDavid added the backport This PR is a back port of some issue or issues already committed to master label Dec 3, 2025
@PDavid
Copy link
Contributor Author

PDavid commented Dec 3, 2025

This is a backport of #7390 to branch-2.

The cherry-pick applied almost cleanly, the only difference is that the master patch had a 1 line change in src/main/asciidoc/_chapters/developer.adoc but this file is not present in this branch (because we only kept and maintain the RefGuide in master) and had to resolve a super-minor conflict in pom.xml.

Testing

Tested the patch the same way as described here: #7390 (comment)

@Apache-HBase

This comment has been minimized.

@Apache-HBase
Copy link

🎊 +1 overall

Vote Subsystem Runtime Logfile Comment
+0 🆗 reexec 1m 7s Docker mode activated.
_ Prechecks _
+1 💚 dupname 0m 0s No case conflicting files found.
+0 🆗 codespell 0m 0s codespell was not available.
+0 🆗 detsecrets 0m 0s detect-secrets was not available.
+1 💚 @author 0m 0s The patch does not contain any @author tags.
+1 💚 hbaseanti 0m 0s Patch does not have any anti-patterns.
_ branch-2 Compile Tests _
+0 🆗 mvndep 0m 57s Maven dependency ordering for branch
+1 💚 mvninstall 4m 13s branch-2 passed
+1 💚 compile 7m 16s branch-2 passed
+1 💚 checkstyle 1m 23s branch-2 passed
+1 💚 spotbugs 9m 29s branch-2 passed
+1 💚 spotless 0m 48s branch has no errors when running spotless:check.
_ Patch Compile Tests _
+0 🆗 mvndep 0m 19s Maven dependency ordering for patch
+1 💚 mvninstall 3m 7s the patch passed
+1 💚 compile 6m 3s the patch passed
+1 💚 javac 6m 3s the patch passed
+1 💚 blanks 0m 0s The patch has no blanks issues.
+1 💚 checkstyle 1m 11s the patch passed
+1 💚 xmllint 0m 0s No new issues.
+1 💚 spotbugs 9m 53s the patch passed
+1 💚 hadoopcheck 17m 37s Patch does not cause any errors with Hadoop 2.10.2 or 3.3.6 3.4.1.
+1 💚 spotless 0m 44s patch has no errors when running spotless:check.
_ Other Tests _
+1 💚 asflicense 0m 54s The patch does not generate ASF License warnings.
68m 0s
Subsystem Report/Notes
Docker ClientAPI=1.43 ServerAPI=1.43 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7504/2/artifact/yetus-general-check/output/Dockerfile
GITHUB PR #7504
Optional Tests dupname asflicense checkstyle javac codespell detsecrets xmllint spotless hadoopcheck compile spotbugs hbaseanti
uname Linux c1f950797fc7 5.4.0-1103-aws #111~18.04.1-Ubuntu SMP Tue May 23 20:04:10 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux
Build tool maven
Personality dev-support/hbase-personality.sh
git revision branch-2 / 719ba8a
Default Java Eclipse Adoptium-11.0.23+9
Max. process+thread count 179 (vs. ulimit of 30000)
modules C: hbase-checkstyle hbase-zookeeper hbase-resource-bundle hbase-server hbase-shaded . U: .
Console output https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7504/2/console
versions git=2.34.1 maven=3.9.8 spotbugs=4.7.3 xmllint=20913
Powered by Apache Yetus 0.15.0 https://yetus.apache.org

This message was automatically generated.

@Apache-HBase
Copy link

🎊 +1 overall

Vote Subsystem Runtime Logfile Comment
+0 🆗 reexec 0m 49s Docker mode activated.
-0 ⚠️ yetus 0m 5s Unprocessed flag(s): --brief-report-file --spotbugs-strict-precheck --author-ignore-list --blanks-eol-ignore-file --blanks-tabs-ignore-file --quick-hadoopcheck
_ Prechecks _
_ branch-2 Compile Tests _
+0 🆗 mvndep 0m 21s Maven dependency ordering for branch
+1 💚 mvninstall 3m 28s branch-2 passed
+1 💚 compile 2m 16s branch-2 passed
+1 💚 javadoc 2m 59s branch-2 passed
+1 💚 shadedjars 6m 29s branch has no errors when building our shaded downstream artifacts.
_ Patch Compile Tests _
+0 🆗 mvndep 0m 17s Maven dependency ordering for patch
+1 💚 mvninstall 3m 5s the patch passed
+1 💚 compile 2m 17s the patch passed
+1 💚 javac 2m 17s the patch passed
+1 💚 javadoc 3m 2s the patch passed
+1 💚 shadedjars 6m 26s patch has no errors when building our shaded downstream artifacts.
_ Other Tests _
+1 💚 unit 273m 36s root in the patch passed.
313m 3s
Subsystem Report/Notes
Docker ClientAPI=1.43 ServerAPI=1.43 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7504/2/artifact/yetus-jdk17-hadoop3-check/output/Dockerfile
GITHUB PR #7504
Optional Tests javac javadoc unit shadedjars compile
uname Linux 049ca714b98c 5.4.0-1103-aws #111~18.04.1-Ubuntu SMP Tue May 23 20:04:10 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux
Build tool maven
Personality dev-support/hbase-personality.sh
git revision branch-2 / 719ba8a
Default Java Eclipse Adoptium-17.0.11+9
Test Results https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7504/2/testReport/
Max. process+thread count 7539 (vs. ulimit of 30000)
modules C: hbase-checkstyle hbase-zookeeper hbase-resource-bundle hbase-server hbase-shaded . U: .
Console output https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7504/2/console
versions git=2.34.1 maven=3.9.8
Powered by Apache Yetus 0.15.0 https://yetus.apache.org

This message was automatically generated.

@Apache-HBase
Copy link

🎊 +1 overall

Vote Subsystem Runtime Logfile Comment
+0 🆗 reexec 0m 44s Docker mode activated.
-0 ⚠️ yetus 0m 5s Unprocessed flag(s): --brief-report-file --spotbugs-strict-precheck --author-ignore-list --blanks-eol-ignore-file --blanks-tabs-ignore-file --quick-hadoopcheck
_ Prechecks _
_ branch-2 Compile Tests _
+0 🆗 mvndep 0m 24s Maven dependency ordering for branch
+1 💚 mvninstall 2m 46s branch-2 passed
+1 💚 compile 1m 46s branch-2 passed
+1 💚 javadoc 2m 35s branch-2 passed
+1 💚 shadedjars 5m 30s branch has no errors when building our shaded downstream artifacts.
_ Patch Compile Tests _
+0 🆗 mvndep 0m 16s Maven dependency ordering for patch
+1 💚 mvninstall 2m 26s the patch passed
+1 💚 compile 1m 51s the patch passed
+1 💚 javac 1m 51s the patch passed
-0 ⚠️ javadoc 1m 33s /results-javadoc-javadoc-root.txt root generated 13 new + 105 unchanged - 13 fixed = 118 total (was 118)
+1 💚 shadedjars 5m 27s patch has no errors when building our shaded downstream artifacts.
_ Other Tests _
+1 💚 unit 417m 51s root in the patch passed.
451m 47s
Subsystem Report/Notes
Docker ClientAPI=1.43 ServerAPI=1.43 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7504/2/artifact/yetus-jdk8-hadoop2-check/output/Dockerfile
GITHUB PR #7504
Optional Tests javac javadoc unit shadedjars compile
uname Linux 55144b217da2 5.4.0-1103-aws #111~18.04.1-Ubuntu SMP Tue May 23 20:04:10 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux
Build tool maven
Personality dev-support/hbase-personality.sh
git revision branch-2 / 719ba8a
Default Java Temurin-1.8.0_412-b08
Test Results https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7504/2/testReport/
Max. process+thread count 6784 (vs. ulimit of 30000)
modules C: hbase-checkstyle hbase-zookeeper hbase-resource-bundle hbase-server hbase-shaded . U: .
Console output https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7504/2/console
versions git=2.34.1 maven=3.9.8
Powered by Apache Yetus 0.15.0 https://yetus.apache.org

This message was automatically generated.

@PDavid
Copy link
Contributor Author

PDavid commented Dec 5, 2025

org.apache.hadoop.hbase.util.TestProcDispatcher.testRetryLimitOnConnClosedErrors test failed in the PR build but I think this is unrelated to these changes. javadoc check complains about THBaseService.java which is a generated class under hbase-thrift - also unrelated.

@PDavid PDavid marked this pull request as ready for review December 5, 2025 13:46
@PDavid PDavid merged commit 28f0ff7 into apache:branch-2 Dec 5, 2025
1 check failed
@PDavid PDavid deleted the HBASE-29596-jamon-jsp-canary-branch-2 branch December 5, 2025 13:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport This PR is a back port of some issue or issues already committed to master

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants