Skip to content

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

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

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

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.

Signed-off-by: Istvan Toth stoty@apache.org
Signed-off-by: Nihal Jain nihaljain@apache.org
(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 3, 2025
@PDavidPDavid 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
Copy Markdown
ContributorAuthor

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

🎊 +1 overall

VoteSubsystemRuntimeLogfileComment
+0 🆗reexec1m 7sDocker 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 Compile Tests _
+0 🆗mvndep0m 57sMaven dependency ordering for branch
+1 💚mvninstall4m 13sbranch-2 passed
+1 💚compile7m 16sbranch-2 passed
+1 💚checkstyle1m 23sbranch-2 passed
+1 💚spotbugs9m 29sbranch-2 passed
+1 💚spotless0m 48sbranch has no errors when running spotless:check.
_ Patch Compile Tests _
+0 🆗mvndep0m 19sMaven dependency ordering for patch
+1 💚mvninstall3m 7sthe patch passed
+1 💚compile6m 3sthe patch passed
+1 💚javac6m 3sthe patch passed
+1 💚blanks0m 0sThe patch has no blanks issues.
+1 💚checkstyle1m 11sthe patch passed
+1 💚xmllint0m 0sNo new issues.
+1 💚spotbugs9m 53sthe patch passed
+1 💚hadoopcheck17m 37sPatch does not cause any errors with Hadoop 2.10.2 or 3.3.6 3.4.1.
+1 💚spotless0m 44spatch has no errors when running spotless:check.
_ Other Tests _
+1 💚asflicense0m 54sThe patch does not generate ASF License warnings.
68m 0s
SubsystemReport/Notes
DockerClientAPI=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 Testsdupname asflicense checkstyle javac codespell detsecrets xmllint spotless hadoopcheck compile spotbugs hbaseanti
unameLinux 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 toolmaven
Personalitydev-support/hbase-personality.sh
git revisionbranch-2 / 719ba8a
Default JavaEclipse Adoptium-11.0.23+9
Max. process+thread count179 (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-7504/2/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 49sDocker 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 Compile Tests _
+0 🆗mvndep0m 21sMaven dependency ordering for branch
+1 💚mvninstall3m 28sbranch-2 passed
+1 💚compile2m 16sbranch-2 passed
+1 💚javadoc2m 59sbranch-2 passed
+1 💚shadedjars6m 29sbranch has no errors when building our shaded downstream artifacts.
_ Patch Compile Tests _
+0 🆗mvndep0m 17sMaven dependency ordering for patch
+1 💚mvninstall3m 5sthe patch passed
+1 💚compile2m 17sthe patch passed
+1 💚javac2m 17sthe patch passed
+1 💚javadoc3m 2sthe patch passed
+1 💚shadedjars6m 26spatch has no errors when building our shaded downstream artifacts.
_ Other Tests _
+1 💚unit273m 36sroot in the patch passed.
313m 3s
SubsystemReport/Notes
DockerClientAPI=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 Testsjavac javadoc unit shadedjars compile
unameLinux 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 toolmaven
Personalitydev-support/hbase-personality.sh
git revisionbranch-2 / 719ba8a
Default JavaEclipse Adoptium-17.0.11+9
Test Resultshttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7504/2/testReport/
Max. process+thread count7539 (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-7504/2/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 🆗reexec0m 44sDocker 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 Compile Tests _
+0 🆗mvndep0m 24sMaven dependency ordering for branch
+1 💚mvninstall2m 46sbranch-2 passed
+1 💚compile1m 46sbranch-2 passed
+1 💚javadoc2m 35sbranch-2 passed
+1 💚shadedjars5m 30sbranch has no errors when building our shaded downstream artifacts.
_ Patch Compile Tests _
+0 🆗mvndep0m 16sMaven dependency ordering for patch
+1 💚mvninstall2m 26sthe patch passed
+1 💚compile1m 51sthe patch passed
+1 💚javac1m 51sthe patch passed
-0 ⚠️javadoc1m 33s/results-javadoc-javadoc-root.txtroot generated 13 new + 105 unchanged - 13 fixed = 118 total (was 118)
+1 💚shadedjars5m 27spatch has no errors when building our shaded downstream artifacts.
_ Other Tests _
+1 💚unit417m 51sroot in the patch passed.
451m 47s
SubsystemReport/Notes
DockerClientAPI=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 Testsjavac javadoc unit shadedjars compile
unameLinux 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 toolmaven
Personalitydev-support/hbase-personality.sh
git revisionbranch-2 / 719ba8a
Default JavaTemurin-1.8.0_412-b08
Test Resultshttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7504/2/testReport/
Max. process+thread count6784 (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-7504/2/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.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-2Dec 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 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