Skip to content

HBASE-29596 Migrate Canary Status Jamon page back to JSP - #7531

Merged
PDavid merged 1 commit into
apache:branch-2.6from
PDavid:HBASE-29596-jamon-jsp-canary-branch-2.6
Dec 9, 2025
Merged

HBASE-29596 Migrate Canary Status Jamon page back to JSP#7531
PDavid merged 1 commit into
apache:branch-2.6from
PDavid:HBASE-29596-jamon-jsp-canary-branch-2.6

Conversation

@PDavid

Copy link
Copy Markdown
Contributor

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 <stoty@apache.org>
Signed-off-by: Nihal Jain <nihaljain@apache.org>
(cherry picked from commit 4ba9b46)
@PDavidPDavid self-assigned this Dec 8, 2025
@PDavidPDavid 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
Copy Markdown
ContributorAuthor

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

💔 -1 overall

VoteSubsystemRuntimeLogfileComment
+0 🆗reexec0m 0sDocker mode activated.
-1 ❌docker0m 4sDocker failed to build run-specific yetus/hbase:tp-8678}.
SubsystemReport/Notes
GITHUB PR#7531
Console outputhttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7531/1/console
versionsgit=2.17.1
Powered byApache Yetus 0.15.0 https://yetus.apache.org

This message was automatically generated.

@Apache-HBase

Copy link
Copy Markdown

🎊 +1 overall

VoteSubsystemRuntimeLogfileComment
+0 🆗reexec1m 6sDocker mode activated.
_ Prechecks _
+1 💚dupname0m 0sNo case conflicting files found.
+0 🆗codespell0m 0scodespell was not available.
+0 🆗detsecrets0m 0sdetect-secrets was not available.
+1 💚@author0m 0sThe patch does not contain any @author tags.
+1 💚hbaseanti0m 0sPatch does not have any anti-patterns.
_ branch-2.6 Compile Tests _
+0 🆗mvndep0m 34sMaven dependency ordering for branch
+1 💚mvninstall5m 14sbranch-2.6 passed
+1 💚compile8m 15sbranch-2.6 passed
+1 💚checkstyle1m 31sbranch-2.6 passed
+1 💚spotbugs13m 12sbranch-2.6 passed
+1 💚spotless1m 14sbranch has no errors when running spotless:check.
_ Patch Compile Tests _
+0 🆗mvndep0m 27sMaven dependency ordering for patch
+1 💚mvninstall4m 34sthe patch passed
+1 💚compile7m 27sthe patch passed
+1 💚javac7m 27sthe patch passed
+1 💚blanks0m 0sThe patch has no blanks issues.
+1 💚checkstyle1m 35sthe patch passed
+1 💚xmllint0m 0sNo new issues.
+1 💚spotbugs15m 18sthe patch passed
+1 💚hadoopcheck24m 37sPatch does not cause any errors with Hadoop 2.10.2 or 3.3.6 3.4.1.
+1 💚spotless1m 6spatch has no errors when running spotless:check.
_ Other Tests _
+1 💚asflicense1m 26sThe patch does not generate ASF License warnings.
91m 7s
SubsystemReport/Notes
DockerClientAPI=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 Testsdupname asflicense checkstyle javac codespell detsecrets xmllint spotless hadoopcheck compile spotbugs hbaseanti
unameLinux 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 toolmaven
Personalitydev-support/hbase-personality.sh
git revisionbranch-2.6 / cc0ecfb
Default JavaEclipse Adoptium-11.0.23+9
Max. process+thread count178 (vs. ulimit of 30000)
modulesC: hbase-checkstyle hbase-zookeeper hbase-resource-bundle hbase-server hbase-shaded . U: .
Console outputhttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7531/1/console
versionsgit=2.34.1 maven=3.9.8 spotbugs=4.7.3 xmllint=20913
Powered byApache Yetus 0.15.0 https://yetus.apache.org

This message was automatically generated.

@Apache-HBase

Copy link
Copy Markdown

🎊 +1 overall

VoteSubsystemRuntimeLogfileComment
+0 🆗reexec0m 47sDocker mode activated.
-0 ⚠️yetus0m 5sUnprocessed 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 🆗mvndep0m 23sMaven dependency ordering for branch
+1 💚mvninstall3m 28sbranch-2.6 passed
+1 💚compile2m 16sbranch-2.6 passed
+1 💚javadoc2m 57sbranch-2.6 passed
+1 💚shadedjars6m 26sbranch has no errors when building our shaded downstream artifacts.
_ Patch Compile Tests _
+0 🆗mvndep0m 18sMaven dependency ordering for patch
+1 💚mvninstall3m 0sthe patch passed
+1 💚compile2m 12sthe patch passed
+1 💚javac2m 12sthe patch passed
+1 💚javadoc2m 51sthe patch passed
+1 💚shadedjars6m 21spatch has no errors when building our shaded downstream artifacts.
_ Other Tests _
+1 💚unit266m 24sroot in the patch passed.
305m 38s
SubsystemReport/Notes
DockerClientAPI=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 Testsjavac javadoc unit shadedjars compile
unameLinux 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 toolmaven
Personalitydev-support/hbase-personality.sh
git revisionbranch-2.6 / cc0ecfb
Default JavaEclipse Adoptium-17.0.11+9
Test Resultshttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7531/1/testReport/
Max. process+thread count7486 (vs. ulimit of 30000)
modulesC: hbase-checkstyle hbase-zookeeper hbase-resource-bundle hbase-server hbase-shaded . U: .
Console outputhttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7531/1/console
versionsgit=2.34.1 maven=3.9.8
Powered byApache Yetus 0.15.0 https://yetus.apache.org

This message was automatically generated.

@Apache-HBase

Copy link
Copy Markdown

💔 -1 overall

VoteSubsystemRuntimeLogfileComment
+0 🆗reexec2m 17sDocker mode activated.
-0 ⚠️yetus0m 5sUnprocessed 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 🆗mvndep0m 33sMaven dependency ordering for branch
+1 💚mvninstall4m 49sbranch-2.6 passed
+1 💚compile2m 54sbranch-2.6 passed
+1 💚javadoc3m 59sbranch-2.6 passed
+1 💚shadedjars9m 7sbranch has no errors when building our shaded downstream artifacts.
_ Patch Compile Tests _
+0 🆗mvndep0m 23sMaven dependency ordering for patch
+1 💚mvninstall4m 14sthe patch passed
+1 💚compile2m 50sthe patch passed
+1 💚javac2m 50sthe patch passed
+1 💚javadoc3m 53sthe patch passed
+1 💚shadedjars9m 4spatch has no errors when building our shaded downstream artifacts.
_ Other Tests _
-1 ❌unit297m 27s/patch-unit-root.txtroot in the patch failed.
347m 35s
SubsystemReport/Notes
DockerClientAPI=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 Testsjavac javadoc unit shadedjars compile
unameLinux 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 toolmaven
Personalitydev-support/hbase-personality.sh
git revisionbranch-2.6 / cc0ecfb
Default JavaEclipse Adoptium-11.0.23+9
Test Resultshttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7531/1/testReport/
Max. process+thread count3504 (vs. ulimit of 30000)
modulesC: hbase-checkstyle hbase-zookeeper hbase-resource-bundle hbase-server hbase-shaded . U: .
Console outputhttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7531/1/console
versionsgit=2.34.1 maven=3.9.8
Powered byApache Yetus 0.15.0 https://yetus.apache.org

This message was automatically generated.

@PDavid

Copy link
Copy Markdown
ContributorAuthor

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.6Dec 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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backportThis 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

@PDavid@Apache-HBase