Skip to content

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

Merged
PDavid merged 2 commits into
apache:branch-2.5from
PDavid:HBASE-29223-jamon-jsp-MasterStatus-branch-2.5
Dec 16, 2025
Merged

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

Conversation

@PDavid

Copy link
Copy Markdown
Contributor

Migrate Master Status Jamon page back to JSP (#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.

(cherry picked from commit be40011)

Fix TestMasterStatusUtil (#7416)

TestMasterStatusUtil.testGetFragmentationInfoTurnedOn failed in master nightly build

(cherry picked from commit 8ef271f) (cherry picked from commit d481a46)

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 self-assigned this Dec 10, 2025
@PDavidPDavid added the backport This PR is a back port of some issue or issues already committed to master label Dec 10, 2025
@PDavid

Copy link
Copy Markdown
ContributorAuthor

This is a backport of #6875 to branch-2.5. Cherry-picked the branch-2 patch (#7478). The reason is that in branch-2, branch-2.6 and branch-2.5 there is no org.apache.hadoop.hbase.rsgroup.RSGroupUtil or RSGroupInfoManager and also there are some other minor differences.

Also includes the addendum which fixes a test I introduced in the patch: (8ef271f)

@Apache-HBase

This comment has been minimized.

@Apache-HBase

This comment has been minimized.

@Apache-HBase

This comment has been minimized.

@Apache-HBase

This comment has been minimized.

Some API methods are not available in this branch.
@Apache-HBase

Copy link
Copy Markdown

🎊 +1 overall

VoteSubsystemRuntimeLogfileComment
+0 🆗reexec1m 3sDocker mode activated.
_ Prechecks _
+1 💚dupname0m 1sNo 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.5 Compile Tests _
+1 💚mvninstall4m 6sbranch-2.5 passed
+1 💚compile3m 20sbranch-2.5 passed
+1 💚checkstyle0m 44sbranch-2.5 passed
+1 💚spotbugs1m 47sbranch-2.5 passed
+1 💚spotless0m 52sbranch has no errors when running spotless:check.
_ Patch Compile Tests _
+1 💚mvninstall4m 0sthe patch passed
+1 💚compile3m 35sthe patch passed
+1 💚javac3m 35sthe patch passed
+1 💚blanks0m 0sThe patch has no blanks issues.
+1 💚checkstyle0m 51shbase-server: The patch generated 0 new + 0 unchanged - 3 fixed = 0 total (was 3)
+1 💚xmllint0m 0sNo new issues.
+1 💚spotbugs2m 23sthe patch passed
+1 💚hadoopcheck27m 13sPatch does not cause any errors with Hadoop 2.10.2 or 3.2.4 3.3.6 3.4.1.
+1 💚spotless0m 55spatch has no errors when running spotless:check.
_ Other Tests _
+1 💚asflicense0m 11sThe patch does not generate ASF License warnings.
53m 18s
SubsystemReport/Notes
DockerClientAPI=1.43 ServerAPI=1.43 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7534/2/artifact/yetus-general-check/output/Dockerfile
GITHUB PR#7534
Optional Testsdupname asflicense javac codespell detsecrets spotless spotbugs checkstyle compile hadoopcheck hbaseanti xmllint jshint
unameLinux 1cb1ebe6fb69 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.5 / c9a9470
Default JavaEclipse Adoptium-11.0.23+9
Max. process+thread count79 (vs. ulimit of 30000)
modulesC: hbase-server U: hbase-server
Console outputhttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7534/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.

@PDavid

PDavid commented Dec 10, 2025

Copy link
Copy Markdown
ContributorAuthor

@Apache-HBase

Copy link
Copy Markdown

🎊 +1 overall

VoteSubsystemRuntimeLogfileComment
+0 🆗reexec0m 50sDocker 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.5 Compile Tests _
+1 💚mvninstall3m 34sbranch-2.5 passed
+1 💚compile1m 3sbranch-2.5 passed
+1 💚javadoc0m 29sbranch-2.5 passed
+1 💚shadedjars6m 29sbranch has no errors when building our shaded downstream artifacts.
_ Patch Compile Tests _
+1 💚mvninstall3m 1sthe patch passed
+1 💚compile0m 55sthe patch passed
+1 💚javac0m 55sthe patch passed
+1 💚javadoc0m 26sthe patch passed
+1 💚shadedjars6m 18spatch has no errors when building our shaded downstream artifacts.
_ Other Tests _
+1 💚unit185m 21shbase-server in the patch passed.
213m 3s
SubsystemReport/Notes
DockerClientAPI=1.43 ServerAPI=1.43 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7534/2/artifact/yetus-jdk17-hadoop3-check/output/Dockerfile
GITHUB PR#7534
Optional Testsjavac javadoc unit compile shadedjars
unameLinux 6270cc863bb7 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.5 / c9a9470
Default JavaEclipse Adoptium-17.0.11+9
Test Resultshttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7534/2/testReport/
Max. process+thread count3480 (vs. ulimit of 30000)
modulesC: hbase-server U: hbase-server
Console outputhttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7534/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 47sDocker 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.5 Compile Tests _
+1 💚mvninstall2m 24sbranch-2.5 passed
+1 💚compile0m 46sbranch-2.5 passed
+1 💚javadoc0m 25sbranch-2.5 passed
+1 💚shadedjars5m 25sbranch has no errors when building our shaded downstream artifacts.
_ Patch Compile Tests _
+1 💚mvninstall2m 27sthe patch passed
+1 💚compile0m 41sthe patch passed
+1 💚javac0m 41sthe patch passed
+1 💚javadoc0m 24sthe patch passed
+1 💚shadedjars5m 24spatch has no errors when building our shaded downstream artifacts.
_ Other Tests _
+1 💚unit193m 0shbase-server in the patch passed.
216m 21s
SubsystemReport/Notes
DockerClientAPI=1.43 ServerAPI=1.43 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7534/2/artifact/yetus-jdk8-hadoop2-check/output/Dockerfile
GITHUB PR#7534
Optional Testsjavac javadoc unit compile shadedjars
unameLinux bb9a15b2779c 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.5 / c9a9470
Default JavaTemurin-1.8.0_412-b08
Test Resultshttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7534/2/testReport/
Max. process+thread count3018 (vs. ulimit of 30000)
modulesC: hbase-server U: hbase-server
Console outputhttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7534/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 49sDocker 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.5 Compile Tests _
+1 💚mvninstall3m 35sbranch-2.5 passed
+1 💚compile0m 49sbranch-2.5 passed
+1 💚javadoc0m 27sbranch-2.5 passed
+1 💚shadedjars6m 34sbranch has no errors when building our shaded downstream artifacts.
_ Patch Compile Tests _
+1 💚mvninstall2m 59sthe patch passed
+1 💚compile0m 49sthe patch passed
+1 💚javac0m 49sthe patch passed
+1 💚javadoc0m 26sthe patch passed
+1 💚shadedjars6m 37spatch has no errors when building our shaded downstream artifacts.
_ Other Tests _
+1 💚unit194m 9shbase-server in the patch passed.
221m 46s
SubsystemReport/Notes
DockerClientAPI=1.43 ServerAPI=1.43 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7534/2/artifact/yetus-jdk11-hadoop3-check/output/Dockerfile
GITHUB PR#7534
Optional Testsjavac javadoc unit compile shadedjars
unameLinux a11d378cb224 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.5 / c9a9470
Default JavaEclipse Adoptium-11.0.23+9
Test Resultshttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7534/2/testReport/
Max. process+thread count3073 (vs. ulimit of 30000)
modulesC: hbase-server U: hbase-server
Console outputhttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7534/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
PDavid marked this pull request as ready for review December 16, 2025 15:47
@PDavid
PDavid merged commit 94f9ff2 into apache:branch-2.5Dec 16, 2025
1 check passed
@PDavid
PDavid deleted the HBASE-29223-jamon-jsp-MasterStatus-branch-2.5 branch December 16, 2025 15:48
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