Skip to content

Conversation

@PDavid
Copy link
Contributor

@PDavid PDavid commented Nov 24, 2025

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 [email protected]
(cherry picked from commit be40011)

PDavid and 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 <[email protected]>
(cherry picked from commit be40011)
TestMasterStatusUtil.testGetFragmentationInfoTurnedOn failed in master nightly build

Signed-off-by: Nihal Jain <[email protected]>
Signed-off-by: Duo Zhang <[email protected]>
(cherry picked from commit 8ef271f)
@PDavid PDavid self-assigned this Nov 24, 2025
@Apache-HBase
Copy link

🎊 +1 overall

Vote Subsystem Runtime Logfile Comment
+0 🆗 reexec 0m 53s 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.
+0 🆗 jshint 0m 0s jshint 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 Compile Tests _
+1 💚 mvninstall 4m 42s branch-2 passed
+1 💚 compile 4m 7s branch-2 passed
+1 💚 checkstyle 0m 55s branch-2 passed
+1 💚 spotbugs 2m 5s branch-2 passed
+1 💚 spotless 1m 1s branch has no errors when running spotless:check.
_ Patch Compile Tests _
+1 💚 mvninstall 4m 3s the patch passed
+1 💚 compile 4m 0s the patch passed
-0 ⚠️ javac 4m 0s /results-compile-javac-hbase-server.txt hbase-server generated 1 new + 194 unchanged - 1 fixed = 195 total (was 195)
+1 💚 blanks 0m 0s The patch has no blanks issues.
+1 💚 checkstyle 0m 49s hbase-server: The patch generated 0 new + 0 unchanged - 3 fixed = 0 total (was 3)
+1 💚 xmllint 0m 0s No new issues.
+1 💚 spotbugs 2m 1s the patch passed
+1 💚 hadoopcheck 20m 55s Patch does not cause any errors with Hadoop 2.10.2 or 3.3.6 3.4.1.
+1 💚 spotless 0m 54s patch has no errors when running spotless:check.
_ Other Tests _
+1 💚 asflicense 0m 14s The patch does not generate ASF License warnings.
48m 48s
Subsystem Report/Notes
Docker ClientAPI=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 Tests dupname asflicense javac codespell detsecrets spotless spotbugs checkstyle compile hadoopcheck hbaseanti xmllint jshint
uname Linux 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 tool maven
Personality dev-support/hbase-personality.sh
git revision branch-2 / 67a3c83
Default Java Eclipse Adoptium-11.0.23+9
Max. process+thread count 77 (vs. ulimit of 30000)
modules C: hbase-server U: hbase-server
Console output https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7478/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.

@PDavid
Copy link
Contributor Author

PDavid commented Nov 24, 2025

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

🎊 +1 overall

Vote Subsystem Runtime Logfile Comment
+0 🆗 reexec 2m 58s Docker mode activated.
-0 ⚠️ yetus 0m 6s 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 Compile Tests _
+1 💚 mvninstall 4m 41s branch-2 passed
+1 💚 compile 1m 11s branch-2 passed
+1 💚 javadoc 0m 34s branch-2 passed
+1 💚 shadedjars 6m 48s branch has no errors when building our shaded downstream artifacts.
_ Patch Compile Tests _
+1 💚 mvninstall 4m 12s the patch passed
+1 💚 compile 1m 8s the patch passed
+1 💚 javac 1m 8s the patch passed
+1 💚 javadoc 0m 33s the patch passed
+1 💚 shadedjars 6m 46s patch has no errors when building our shaded downstream artifacts.
_ Other Tests _
+1 💚 unit 414m 28s hbase-server in the patch passed.
447m 19s
Subsystem Report/Notes
Docker ClientAPI=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 Tests javac javadoc unit compile shadedjars
uname Linux 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 tool maven
Personality dev-support/hbase-personality.sh
git revision branch-2 / 67a3c83
Default Java Eclipse Adoptium-17.0.11+9
Test Results https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7478/1/testReport/
Max. process+thread count 2394 (vs. ulimit of 30000)
modules C: hbase-server U: hbase-server
Console output https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7478/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 Nov 26, 2025

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-2 Nov 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 <[email protected]>
(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 <[email protected]>
Signed-off-by: Duo Zhang <[email protected]>
(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 <[email protected]>
(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 <[email protected]>
Signed-off-by: Duo Zhang <[email protected]>
(cherry picked from commit 8ef271f)
(cherry picked from commit d481a46)
@PDavid PDavid 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 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