Skip to content

Conversation

@PDavid
Copy link
Contributor

@PDavid PDavid commented Dec 10, 2024

This is the backport of #6490 for branch-2.5.

@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.

@PDavid
Copy link
Contributor Author

PDavid commented Dec 10, 2024

Test failures seems to be unrelated.

@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.

@PDavid
Copy link
Contributor Author

PDavid commented Jan 7, 2025

This branch will need to be rebased (or cherry-picked again) when #6525 is merged.

@PDavid PDavid force-pushed the HBASE-28832-bootstrap-upgrade-5-branch-2.5 branch from 8f248f1 to ed50c32 Compare January 9, 2025 11:07
@PDavid
Copy link
Contributor Author

PDavid commented Jan 9, 2025

OK, this branch is rebased. I cherry-picked again the whole Bootstrap upgrade master commit. Unfortunately this is still not a 100% clean cherry-pick. I had to resolve some minor conflicts where we had navbars (because the Promotheus links are not there in this branch) and table.jsp but this is very-very close to the original master patch: #6490

Also added the small fix for TestInfoServersACL.

@PDavid PDavid marked this pull request as ready for review January 9, 2025 11:11
@NihalJain
Copy link
Contributor

As per response in mail thread, we do not want this for upcoming releases right? Let's hold on merging this until release.

@PDavid
Copy link
Contributor Author

PDavid commented Jan 9, 2025

As per response in mail thread, we do not want this for upcoming releases right? Let's hold on merging this until release.

@NihalJain thanks for pointing out. 👍 Yes, you are right.

@NihalJain NihalJain added the backport This PR is a back port of some issue or issues already committed to master label Jan 9, 2025
@Apache-HBase

This comment has been minimized.

@PDavid PDavid force-pushed the HBASE-28832-bootstrap-upgrade-5-branch-2.5 branch from ed50c32 to 8b9937f Compare January 10, 2025 07:02
@PDavid
Copy link
Contributor Author

PDavid commented Jan 10, 2025

Fixed blank lines reported by PR build. Rebased.

@Apache-HBase

This comment has been minimized.

@PDavid PDavid force-pushed the HBASE-28832-bootstrap-upgrade-5-branch-2.5 branch from 8b9937f to d1e419f Compare February 28, 2025 13:46
@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.

@PDavid
Copy link
Contributor Author

PDavid commented Mar 4, 2025

I think this backport PR is now ready to merge. What do you think @NihalJain ?

@NihalJain
Copy link
Contributor

I think this backport PR is now ready to merge. What do you think @NihalJain ?

HI @PDavid HBase 2.5.11 release is in progress, we should wait for it to close I think.

@PDavid
Copy link
Contributor Author

PDavid commented Mar 5, 2025

I think this backport PR is now ready to merge. What do you think @NihalJain ?

HI @PDavid HBase 2.5.11 release is in progress, we should wait for it to close I think.

Ah, sure, you are right, thanks. 👍 Sorry, somehow thought that the 2.5.11 release was already done.

PDavid added 2 commits March 18, 2025 14:36
…3.3 (apache#6490)

First we upgraded to Bootstrap v4 - this was the majority of the changes - and then I upgraded to Bootstrap 5.3.3 - which is the latest non-vulnerable version according to https://security.snyk.io/package/npm/bootstrap/3.4.1

Changes were based on the migration documentation:
- https://getbootstrap.com/docs/4.6/migration/
- https://getbootstrap.com/docs/5.3/migration/

Most of the changes are related to navbar-s, tabs and forms.

The new Bootstrap look has a bit bigger font sizes but it is still OK in my opinion.

Bootstrap v5 is not requiring JQuery anymore but we have some JQuery plugins (jquery.tablesorter.min.js, tab.js) which still need it so I left JQuery in.

- Removed bootstrap-theme.min.css and Glyphicons icon font because these are not present anymore in newer Bootstrap versions.
- Upgraded checked in Bootstrap CSS and JS files to v4.
- Moved some inline CSS styles to hbase.css file (DRY).
- The page-header class was dropped in Bootstrap v4 so added page-header small grey color to hbase.css.
- Removed some unused imports in JSP files.
- Improved the styling of the Log Level form
- Replaced hbase_logo_small.png under thrift module with the hbase-server one. Reason: to make sure that they are the same size (this under thrift was smaller).
- Upgraded checked in Bootstrap CSS and JS files to v5.
- Migrated navbars for v5:
  - Navbars now require a container within (to drastically simplify spacing requirements and CSS required).
  - The .active class can no longer be applied to .nav-items, it must be applied directly on .nav-links.
- Migrated data attributes. Data attributes for all Bootstrap JavaScript plugins are now namespaced to help distinguish Bootstrap functionality from third parties and your own code. For example, we use data-bs-toggle instead of data-toggle.
- form-inline was dropped in v5, so inline forms had to be styled with grid and utilities instead.
- Added the favicon of the HBase website to the web UI pages.

Signed-off-by: Nick Dimiduk <[email protected]>
Signed-off-by: Nihal Jain <[email protected]>
(cherry picked from commit 744ce13)
* There were some changes in the Bootstrap upgrade which caused the test to fail because the test expected certain text to appear on the UI page.

(cherry picked from commit 43f728c)
@PDavid PDavid force-pushed the HBASE-28832-bootstrap-upgrade-5-branch-2.5 branch from d1e419f to 2451432 Compare March 18, 2025 16:16
@Apache-HBase
Copy link

💔 -1 overall

Vote Subsystem Runtime Logfile Comment
+0 🆗 reexec 0m 48s 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.5 Compile Tests _
+0 🆗 mvndep 0m 12s Maven dependency ordering for branch
+1 💚 mvninstall 3m 5s branch-2.5 passed
+1 💚 compile 2m 15s branch-2.5 passed
+1 💚 javadoc 3m 44s branch-2.5 passed
+1 💚 shadedjars 6m 23s branch has no errors when building our shaded downstream artifacts.
_ Patch Compile Tests _
+0 🆗 mvndep 0m 12s Maven dependency ordering for patch
+1 💚 mvninstall 2m 57s the patch passed
+1 💚 compile 2m 18s the patch passed
+1 💚 javac 2m 18s the patch passed
+1 💚 javadoc 3m 44s the patch passed
+1 💚 shadedjars 6m 1s patch has no errors when building our shaded downstream artifacts.
_ Other Tests _
-1 ❌ unit 38m 5s /patch-unit-root.txt root in the patch failed.
73m 3s
Subsystem Report/Notes
Docker ClientAPI=1.43 ServerAPI=1.43 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6525/6/artifact/yetus-jdk8-hadoop2-check/output/Dockerfile
GITHUB PR #6525
Optional Tests javac javadoc unit compile shadedjars
uname Linux 8b60e330465d 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.5 / 2451432
Default Java Temurin-1.8.0_412-b08
Test Results https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6525/6/testReport/
Max. process+thread count 2343 (vs. ulimit of 30000)
modules C: hbase-resource-bundle hbase-http hbase-server hbase-thrift hbase-rest . U: .
Console output https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6525/6/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.

@Apache-HBase
Copy link

🎊 +1 overall

Vote Subsystem Runtime Logfile Comment
+0 🆗 reexec 0m 50s Docker mode activated.
_ Prechecks _
+1 💚 dupname 0m 1s 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.
+0 🆗 shelldocs 0m 0s Shelldocs 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.5 Compile Tests _
+0 🆗 mvndep 0m 12s Maven dependency ordering for branch
+1 💚 mvninstall 3m 41s branch-2.5 passed
+1 💚 compile 5m 34s branch-2.5 passed
+1 💚 checkstyle 1m 28s branch-2.5 passed
+1 💚 spotbugs 20m 17s branch-2.5 passed
+1 💚 spotless 1m 1s branch has no errors when running spotless:check.
_ Patch Compile Tests _
+0 🆗 mvndep 0m 16s Maven dependency ordering for patch
+1 💚 mvninstall 4m 14s the patch passed
+1 💚 compile 6m 31s the patch passed
+1 💚 javac 6m 31s the patch passed
+1 💚 blanks 0m 0s The patch has no blanks issues.
+1 💚 checkstyle 1m 25s the patch passed
+1 💚 shellcheck 0m 1s No new issues.
+1 💚 spotbugs 20m 21s the patch passed
+1 💚 hadoopcheck 37m 28s Patch does not cause any errors with Hadoop 2.10.2 or 3.2.4 3.3.6 3.4.0.
+1 💚 spotless 1m 40s patch has no errors when running spotless:check.
_ Other Tests _
+1 💚 asflicense 2m 47s The patch does not generate ASF License warnings.
111m 30s
Subsystem Report/Notes
Docker ClientAPI=1.43 ServerAPI=1.43 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6525/6/artifact/yetus-general-check/output/Dockerfile
GITHUB PR #6525
Optional Tests dupname asflicense javac spotbugs checkstyle codespell detsecrets compile hadoopcheck hbaseanti spotless jshint shellcheck shelldocs
uname Linux 6d1465ef660d 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.5 / 2451432
Default Java Eclipse Adoptium-11.0.23+9
Max. process+thread count 176 (vs. ulimit of 30000)
modules C: hbase-resource-bundle hbase-http hbase-server hbase-thrift hbase-rest . U: .
Console output https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6525/6/console
versions git=2.34.1 maven=3.9.8 spotbugs=4.7.3 shellcheck=0.8.0
Powered by Apache Yetus 0.15.0 https://yetus.apache.org

This message was automatically generated.

@Apache-HBase
Copy link

💔 -1 overall

Vote Subsystem Runtime Logfile Comment
+0 🆗 reexec 10m 26s Docker mode activated.
-0 ⚠️ yetus 0m 7s 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.5 Compile Tests _
+0 🆗 mvndep 0m 14s Maven dependency ordering for branch
+1 💚 mvninstall 5m 17s branch-2.5 passed
+1 💚 compile 2m 56s branch-2.5 passed
+1 💚 javadoc 4m 13s branch-2.5 passed
+1 💚 shadedjars 7m 46s branch has no errors when building our shaded downstream artifacts.
_ Patch Compile Tests _
+0 🆗 mvndep 0m 14s Maven dependency ordering for patch
+1 💚 mvninstall 4m 52s the patch passed
+1 💚 compile 2m 53s the patch passed
+1 💚 javac 2m 53s the patch passed
+1 💚 javadoc 4m 24s the patch passed
+1 💚 shadedjars 7m 40s patch has no errors when building our shaded downstream artifacts.
_ Other Tests _
-1 ❌ unit 429m 52s /patch-unit-root.txt root in the patch failed.
500m 6s
Subsystem Report/Notes
Docker ClientAPI=1.43 ServerAPI=1.43 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6525/6/artifact/yetus-jdk11-hadoop3-check/output/Dockerfile
GITHUB PR #6525
Optional Tests javac javadoc unit compile shadedjars
uname Linux cace924a7d79 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.5 / 2451432
Default Java Eclipse Adoptium-11.0.23+9
Test Results https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6525/6/testReport/
Max. process+thread count 4894 (vs. ulimit of 30000)
modules C: hbase-resource-bundle hbase-http hbase-server hbase-thrift hbase-rest . U: .
Console output https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6525/6/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.

@NihalJain
Copy link
Contributor

@PDavid So we are good here now? @apurtell Should we go ahead and get this in ?

@PDavid
Copy link
Contributor Author

PDavid commented Mar 19, 2025

Hi @NihalJain,
Yes, thanks, from my side this is ready.

(Just rebased to fix conflicts with base branch.)

Copy link
Contributor

@petersomogyi petersomogyi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked the UI in standalone mode and haven't noticed any issues.

@petersomogyi petersomogyi merged commit 38d7286 into apache:branch-2.5 Mar 24, 2025
1 check failed
@PDavid PDavid deleted the HBASE-28832-bootstrap-upgrade-5-branch-2.5 branch March 24, 2025 10:18
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.

4 participants