Skip to content

Conversation

@PDavid
Copy link
Contributor

@PDavid PDavid commented Dec 8, 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.

(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 8, 2025
@PDavid PDavid added the backport This PR is a back port of some issue or issues already committed to master label Dec 8, 2025
@PDavid
Copy link
Contributor Author

PDavid commented Dec 8, 2025

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

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
Copy link

💔 -1 overall

Vote Subsystem Runtime Logfile Comment
+0 🆗 reexec 0m 0s Docker mode activated.
-1 ❌ docker 0m 4s Docker failed to build run-specific yetus/hbase:tp-8678}.
Subsystem Report/Notes
GITHUB PR #7531
Console output https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7531/1/console
versions git=2.17.1
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 1m 6s 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.6 Compile Tests _
+0 🆗 mvndep 0m 34s Maven dependency ordering for branch
+1 💚 mvninstall 5m 14s branch-2.6 passed
+1 💚 compile 8m 15s branch-2.6 passed
+1 💚 checkstyle 1m 31s branch-2.6 passed
+1 💚 spotbugs 13m 12s branch-2.6 passed
+1 💚 spotless 1m 14s branch has no errors when running spotless:check.
_ Patch Compile Tests _
+0 🆗 mvndep 0m 27s Maven dependency ordering for patch
+1 💚 mvninstall 4m 34s the patch passed
+1 💚 compile 7m 27s the patch passed
+1 💚 javac 7m 27s the patch passed
+1 💚 blanks 0m 0s The patch has no blanks issues.
+1 💚 checkstyle 1m 35s the patch passed
+1 💚 xmllint 0m 0s No new issues.
+1 💚 spotbugs 15m 18s the patch passed
+1 💚 hadoopcheck 24m 37s Patch does not cause any errors with Hadoop 2.10.2 or 3.3.6 3.4.1.
+1 💚 spotless 1m 6s patch has no errors when running spotless:check.
_ Other Tests _
+1 💚 asflicense 1m 26s The patch does not generate ASF License warnings.
91m 7s
Subsystem Report/Notes
Docker ClientAPI=1.43 ServerAPI=1.43 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7531/1/artifact/yetus-general-check/output/Dockerfile
GITHUB PR #7531
Optional Tests dupname asflicense checkstyle javac codespell detsecrets xmllint spotless hadoopcheck compile spotbugs hbaseanti
uname Linux c306c040cee8 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.6 / cc0ecfb
Default Java Eclipse Adoptium-11.0.23+9
Max. process+thread count 178 (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-7531/1/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 47s 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.6 Compile Tests _
+0 🆗 mvndep 0m 23s Maven dependency ordering for branch
+1 💚 mvninstall 3m 28s branch-2.6 passed
+1 💚 compile 2m 16s branch-2.6 passed
+1 💚 javadoc 2m 57s branch-2.6 passed
+1 💚 shadedjars 6m 26s branch has no errors when building our shaded downstream artifacts.
_ Patch Compile Tests _
+0 🆗 mvndep 0m 18s Maven dependency ordering for patch
+1 💚 mvninstall 3m 0s the patch passed
+1 💚 compile 2m 12s the patch passed
+1 💚 javac 2m 12s the patch passed
+1 💚 javadoc 2m 51s the patch passed
+1 💚 shadedjars 6m 21s patch has no errors when building our shaded downstream artifacts.
_ Other Tests _
+1 💚 unit 266m 24s root in the patch passed.
305m 38s
Subsystem Report/Notes
Docker ClientAPI=1.43 ServerAPI=1.43 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7531/1/artifact/yetus-jdk17-hadoop3-check/output/Dockerfile
GITHUB PR #7531
Optional Tests javac javadoc unit shadedjars compile
uname Linux ef9821c7d590 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.6 / cc0ecfb
Default Java Eclipse Adoptium-17.0.11+9
Test Results https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7531/1/testReport/
Max. process+thread count 7486 (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-7531/1/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 2m 17s 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.6 Compile Tests _
+0 🆗 mvndep 0m 33s Maven dependency ordering for branch
+1 💚 mvninstall 4m 49s branch-2.6 passed
+1 💚 compile 2m 54s branch-2.6 passed
+1 💚 javadoc 3m 59s branch-2.6 passed
+1 💚 shadedjars 9m 7s branch has no errors when building our shaded downstream artifacts.
_ Patch Compile Tests _
+0 🆗 mvndep 0m 23s Maven dependency ordering for patch
+1 💚 mvninstall 4m 14s the patch passed
+1 💚 compile 2m 50s the patch passed
+1 💚 javac 2m 50s the patch passed
+1 💚 javadoc 3m 53s the patch passed
+1 💚 shadedjars 9m 4s patch has no errors when building our shaded downstream artifacts.
_ Other Tests _
-1 ❌ unit 297m 27s /patch-unit-root.txt root in the patch failed.
347m 35s
Subsystem Report/Notes
Docker ClientAPI=1.48 ServerAPI=1.48 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7531/1/artifact/yetus-jdk11-hadoop3-check/output/Dockerfile
GITHUB PR #7531
Optional Tests javac javadoc unit shadedjars compile
uname Linux 6abd6e24a665 6.8.0-1024-aws #26~22.04.1-Ubuntu SMP Wed Feb 19 06:54:57 UTC 2025 x86_64 x86_64 x86_64 GNU/Linux
Build tool maven
Personality dev-support/hbase-personality.sh
git revision branch-2.6 / cc0ecfb
Default Java Eclipse Adoptium-11.0.23+9
Test Results https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7531/1/testReport/
Max. process+thread count 3504 (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-7531/1/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 9, 2025

org.apache.hadoop.hbase.quotas.TestDefaultHandlerUsageQuota.testDefaultHandlerUsageLimits failed in the PR build. I think it is unrelated and it is successful locally.

@PDavid PDavid marked this pull request as ready for review December 9, 2025 09:31
@PDavid PDavid merged commit c2b87f1 into apache:branch-2.6 Dec 9, 2025
1 check failed
@PDavid PDavid deleted the HBASE-29596-jamon-jsp-canary-branch-2.6 branch December 9, 2025 09:32
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