Skip to content

HBASE-29223 Migrate Master Status Jamon page back to JSP (#6875) - #7478

Merged
PDavid merged 3 commits into
apache:branch-2from
PDavid:HBASE-29223-jamon-jsp-MasterStatus-branch-2
Nov 26, 2025
Merged

HBASE-29223 Migrate Master Status Jamon page back to JSP (#6875)#7478
PDavid merged 3 commits into
apache:branch-2from
PDavid:HBASE-29223-jamon-jsp-MasterStatus-branch-2

Conversation

@PDavid

@PDavidPDavid commented Nov 24, 2025

Copy link
Copy Markdown
Contributor

The JSP code is equivalent to the Jamon code, just changed the syntax back to JSP.
Request attributes are used to transfer data between JSP pages.
Tried to preserve the code as much as possible but did some changes:

Sub-templates were usually extracted to separate JSP file (and included with <jsp:include), in some case it was extracted as Java method.

Extracted some sections from master page to separate JSP pages:

  • Software Attributes
  • Warnings

Extracted the long JavaScript from the master page which executes on page load to separate JS file.

Extracted some frequently used static methods to a new util class: MasterStatusUtil. Also added unit tests for the static methods in MasterStatusUtil.

Changed the Master Status page back to /master.jsp again. Now made sure that /master-status redirects to /master.jsp.

Signed-off-by: Istvan Toth stoty@apache.org
(cherry picked from commit be40011)

PDavidand others added 3 commits November 24, 2025 14:16
The JSP code is equivalent to the Jamon code, just changed the syntax back to JSP.
Request attributes are used to transfer data between JSP pages.
Tried to preserve the code as much as possible but did some changes:
Sub-templates were usually extracted to separate JSP file (and included with `<jsp:include`), in some case it was extracted as Java method.
Extracted some sections from master page to separate JSP pages:
- Software Attributes
- Warnings
Extracted the long JavaScript from the master page which executes on page load to separate JS file.
Extracted some frequently used static methods to a new util class: `MasterStatusUtil`. Also added unit tests for the static methods in `MasterStatusUtil`.
Changed the Master Status page back to `/master.jsp` again. Now made sure that `/master-status` redirects to `/master.jsp`.
Signed-off-by: Istvan Toth <stoty@apache.org>
(cherry picked from commit be40011)
TestMasterStatusUtil.testGetFragmentationInfoTurnedOn failed in master nightly build
Signed-off-by: Nihal Jain <nihaljain@apache.org>
Signed-off-by: Duo Zhang <zhangduo@apache.org>
(cherry picked from commit 8ef271f)
@PDavidPDavid self-assigned this Nov 24, 2025
@Apache-HBase

Copy link
Copy Markdown

🎊 +1 overall

VoteSubsystemRuntimeLogfileComment
+0 🆗reexec0m 53sDocker mode activated.
_ Prechecks _
+1 💚dupname0m 0sNo case conflicting files found.
+0 🆗codespell0m 0scodespell was not available.
+0 🆗detsecrets0m 0sdetect-secrets was not available.
+0 🆗jshint0m 0sjshint 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 _
+1 💚mvninstall4m 42sbranch-2 passed
+1 💚compile4m 7sbranch-2 passed
+1 💚checkstyle0m 55sbranch-2 passed
+1 💚spotbugs2m 5sbranch-2 passed
+1 💚spotless1m 1sbranch has no errors when running spotless:check.
_ Patch Compile Tests _
+1 💚mvninstall4m 3sthe patch passed
+1 💚compile4m 0sthe patch passed
-0 ⚠️javac4m 0s/results-compile-javac-hbase-server.txthbase-server generated 1 new + 194 unchanged - 1 fixed = 195 total (was 195)
+1 💚blanks0m 0sThe patch has no blanks issues.
+1 💚checkstyle0m 49shbase-server: The patch generated 0 new + 0 unchanged - 3 fixed = 0 total (was 3)
+1 💚xmllint0m 0sNo new issues.
+1 💚spotbugs2m 1sthe patch passed
+1 💚hadoopcheck20m 55sPatch does not cause any errors with Hadoop 2.10.2 or 3.3.6 3.4.1.
+1 💚spotless0m 54spatch has no errors when running spotless:check.
_ Other Tests _
+1 💚asflicense0m 14sThe patch does not generate ASF License warnings.
48m 48s
SubsystemReport/Notes
DockerClientAPI=1.43 ServerAPI=1.43 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7478/1/artifact/yetus-general-check/output/Dockerfile
GITHUB PR#7478
Optional Testsdupname asflicense javac codespell detsecrets spotless spotbugs checkstyle compile hadoopcheck hbaseanti xmllint jshint
unameLinux 1705887e0779 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 / 67a3c83
Default JavaEclipse Adoptium-11.0.23+9
Max. process+thread count77 (vs. ulimit of 30000)
modulesC: hbase-server U: hbase-server
Console outputhttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7478/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.

@PDavid

PDavid commented Nov 24, 2025

Copy link
Copy Markdown
ContributorAuthor

This is a backport of #6875 to branch-2. Cherry-picked the master commit but it did not apply cleanly. The reason is that in branch-2 there is no org.apache.hadoop.hbase.rsgroup.RSGroupUtil or RSGroupInfoManager and also there are some other minor differences. So because of this on cherry-picking I had to adjust the patch.

Also includes the addendum which fixes a test (8ef271f)

Testing

Tested this the same way, as I did for the master version:

image

@Apache-HBase

Copy link
Copy Markdown

🎊 +1 overall

VoteSubsystemRuntimeLogfileComment
+0 🆗reexec2m 58sDocker mode activated.
-0 ⚠️yetus0m 6sUnprocessed 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 _
+1 💚mvninstall4m 41sbranch-2 passed
+1 💚compile1m 11sbranch-2 passed
+1 💚javadoc0m 34sbranch-2 passed
+1 💚shadedjars6m 48sbranch has no errors when building our shaded downstream artifacts.
_ Patch Compile Tests _
+1 💚mvninstall4m 12sthe patch passed
+1 💚compile1m 8sthe patch passed
+1 💚javac1m 8sthe patch passed
+1 💚javadoc0m 33sthe patch passed
+1 💚shadedjars6m 46spatch has no errors when building our shaded downstream artifacts.
_ Other Tests _
+1 💚unit414m 28shbase-server in the patch passed.
447m 19s
SubsystemReport/Notes
DockerClientAPI=1.48 ServerAPI=1.48 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7478/1/artifact/yetus-jdk17-hadoop3-check/output/Dockerfile
GITHUB PR#7478
Optional Testsjavac javadoc unit compile shadedjars
unameLinux baa075c66702 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 / 67a3c83
Default JavaEclipse Adoptium-17.0.11+9
Test Resultshttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7478/1/testReport/
Max. process+thread count2394 (vs. ulimit of 30000)
modulesC: hbase-server U: hbase-server
Console outputhttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7478/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.ipc.TestSecureNettyRpcServer tests failed. These failures seems to be unrelated to me.

@PDavid
PDavid marked this pull request as ready for review November 26, 2025 08:08
@PDavid
PDavid merged commit d481a46 into apache:branch-2Nov 26, 2025
1 check failed
@PDavid
PDavid deleted the HBASE-29223-jamon-jsp-MasterStatus-branch-2 branch November 26, 2025 08:19
PDavid added a commit to PDavid/hbase that referenced this pull request Dec 1, 2025
apache#7478)
* HBASE-29223 Migrate Master Status Jamon page back to JSP (apache#6875)
The JSP code is equivalent to the Jamon code, just changed the syntax back to JSP.
Request attributes are used to transfer data between JSP pages.
Tried to preserve the code as much as possible but did some changes:
Sub-templates were usually extracted to separate JSP file (and included with `<jsp:include`), in some case it was extracted as Java method.
Extracted some sections from master page to separate JSP pages:
- Software Attributes
- Warnings
Extracted the long JavaScript from the master page which executes on page load to separate JS file.
Extracted some frequently used static methods to a new util class: `MasterStatusUtil`. Also added unit tests for the static methods in `MasterStatusUtil`.
Changed the Master Status page back to `/master.jsp` again. Now made sure that `/master-status` redirects to `/master.jsp`.
Signed-off-by: Istvan Toth <stoty@apache.org>
(cherry picked from commit be40011)
* HBASE-29223 spotless fix
* [ADDENDUM] HBASE-29223 Fix TestMasterStatusUtil (apache#7416)
TestMasterStatusUtil.testGetFragmentationInfoTurnedOn failed in master nightly build
Signed-off-by: Nihal Jain <nihaljain@apache.org>
Signed-off-by: Duo Zhang <zhangduo@apache.org>
(cherry picked from commit 8ef271f)
(cherry picked from commit d481a46)
PDavid added a commit to PDavid/hbase that referenced this pull request Dec 10, 2025
apache#7478)
* HBASE-29223 Migrate Master Status Jamon page back to JSP (apache#6875)
The JSP code is equivalent to the Jamon code, just changed the syntax back to JSP.
Request attributes are used to transfer data between JSP pages.
Tried to preserve the code as much as possible but did some changes:
Sub-templates were usually extracted to separate JSP file (and included with `<jsp:include`), in some case it was extracted as Java method.
Extracted some sections from master page to separate JSP pages:
- Software Attributes
- Warnings
Extracted the long JavaScript from the master page which executes on page load to separate JS file.
Extracted some frequently used static methods to a new util class: `MasterStatusUtil`. Also added unit tests for the static methods in `MasterStatusUtil`.
Changed the Master Status page back to `/master.jsp` again. Now made sure that `/master-status` redirects to `/master.jsp`.
Signed-off-by: Istvan Toth <stoty@apache.org>
(cherry picked from commit be40011)
* HBASE-29223 spotless fix
* [ADDENDUM] HBASE-29223 Fix TestMasterStatusUtil (apache#7416)
TestMasterStatusUtil.testGetFragmentationInfoTurnedOn failed in master nightly build
Signed-off-by: Nihal Jain <nihaljain@apache.org>
Signed-off-by: Duo Zhang <zhangduo@apache.org>
(cherry picked from commit 8ef271f)
(cherry picked from commit d481a46)
@PDavidPDavid added the backport This PR is a back port of some issue or issues already committed to master label Dec 10, 2025
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