HBASE-29036 Backport missing UI patches to branch-2.6 by PDavid · Pull Request #6550 · apache/hbase

PDavid · 2024-12-18T07:29:27Z

Cherry-picked the following patches which were missing on branch-2.6 branch. Most of these applied as a clean cherry-pick (without conflicts). Unfortunately there were some which had conflicts and I manually resolved them.
Each commit message contains from which commit it was cherry-picked from.

HBASE-18382 add transport type info into Thrift UI (HBASE-18382 add transport type info into Thrift UI #880)
HBASE-20693 Refactor thrift jsp's and extract header and footer (HBASE-20693 Refactor thrift jsp's and extract header and footer #5732)
HBASE-24624 Optimize table.jsp code (HBASE-24624 Optimize table.jsp code #1963) - ⚠️ This did not apply cleanly - had to resolve conflicts manually
HBASE-25402 Sorting order by start key or end key is not considering empty start key/end key (HBASE-25402 HBase UI: sorting order by start key or end key is not considering empty start key/end key #2955)
HBASE-28778 NPE may occur when opening master-status or table.jsp or procedure.jsp while Master is initializing (HBASE-28778 NPE may occur when opening master-status or table.jsp or procedure.js… #6152)

Signed-off-by: Wellington Chevreuil <wchevreuil@apache.org> Signed-off-by: Bharath Vissapragada <bharathv@apache.org> Signed-off-by: Viraj Jasani <virajjasani007@gmail.com> (cherry picked from commit 82e155e)

…he#5732) - Fixes the way logLevel page renders in UI Signed-off-by: Nick Dimiduk <ndimiduk@apache.org> (cherry picked from commit ede4ccd)

Signed-off-by: Guangxu Cheng <gxcheng@apache.org> (cherry picked from commit 9ad16aa)

…empty start key/end key (apache#2955) Signed-off-by: Duo Zhang <zhangduo@apache.org> Signed-off-by: Pankaj Kumar<pankajkumar@apache.org> (cherry picked from commit 157200e)

…procedure.jsp while Master is initializing (apache#6152) Signed-off-by: Duo Zhang <zhangduo@apache.org> (cherry picked from commit 3caaf2d)

Apache-HBase · 2024-12-18T07:59:20Z

🎊 +1 overall

Vote	Subsystem	Runtime	Logfile	Comment
+0 🆗	reexec	1m 0s		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.
+1 💚	@author	0m 0s		The patch does not contain any @author tags.
			_ branch-2.6 Compile Tests _
+0 🆗	mvndep	0m 11s		Maven dependency ordering for branch
+1 💚	mvninstall	4m 26s		branch-2.6 passed
+1 💚	spotless	1m 3s		branch has no errors when running spotless:check.
			_ Patch Compile Tests _
+0 🆗	mvndep	0m 21s		Maven dependency ordering for patch
+1 💚	mvninstall	3m 56s		the patch passed
+1 💚	blanks	0m 1s		The patch has no blanks issues.
+1 💚	spotless	0m 46s		patch has no errors when running spotless:check.
			_ Other Tests _
+1 💚	asflicense	0m 21s		The patch does not generate ASF License warnings.
		13m 36s

Subsystem	Report/Notes
Docker	ClientAPI=1.47 ServerAPI=1.47 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6550/1/artifact/yetus-general-check/output/Dockerfile
GITHUB PR	#6550
Optional Tests	dupname asflicense javac codespell detsecrets spotless
uname	Linux 903841654ef0 5.4.0-200-generic #220-Ubuntu SMP Fri Sep 27 13:19:16 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux
Build tool	maven
Personality	dev-support/hbase-personality.sh
git revision	branch-2.6 / `59d05d6`
Default Java	Eclipse Adoptium-11.0.23+9
Max. process+thread count	79 (vs. ulimit of 30000)
modules	C: hbase-server hbase-thrift U: .
Console output	https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6550/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.

Apache-HBase · 2024-12-18T11:08:38Z

💔 -1 overall

Vote	Subsystem	Runtime	Logfile	Comment
+0 🆗	reexec	0m 47s		Docker mode activated.
-0 ⚠️	yetus	0m 5s		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.6 Compile Tests _
+0 🆗	mvndep	0m 9s		Maven dependency ordering for branch
+1 💚	mvninstall	2m 42s		branch-2.6 passed
+1 💚	javadoc	0m 45s		branch-2.6 passed
			_ Patch Compile Tests _
+0 🆗	mvndep	0m 16s		Maven dependency ordering for patch
+1 💚	mvninstall	2m 46s		the patch passed
+1 💚	javadoc	0m 44s		the patch passed
			_ Other Tests _
-1 ❌	unit	182m 31s	/patch-unit-hbase-server.txt	hbase-server in the patch failed.
+1 💚	unit	8m 5s		hbase-thrift in the patch passed.
		202m 59s

Subsystem	Report/Notes
Docker	ClientAPI=1.47 ServerAPI=1.47 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6550/1/artifact/yetus-jdk17-hadoop3-check/output/Dockerfile
GITHUB PR	#6550
Optional Tests	javac javadoc unit
uname	Linux d5ec75c3e92b 5.4.0-200-generic #220-Ubuntu SMP Fri Sep 27 13:19:16 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux
Build tool	maven
Personality	dev-support/hbase-personality.sh
git revision	branch-2.6 / `59d05d6`
Default Java	Eclipse Adoptium-17.0.11+9
Test Results	https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6550/1/testReport/
Max. process+thread count	4288 (vs. ulimit of 30000)
modules	C: hbase-server hbase-thrift U: .
Console output	https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6550/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.

Apache-HBase · 2024-12-18T11:13:12Z

🎊 +1 overall

Vote	Subsystem	Runtime	Logfile	Comment
+0 🆗	reexec	0m 44s		Docker mode activated.
-0 ⚠️	yetus	0m 4s		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.6 Compile Tests _
+0 🆗	mvndep	0m 10s		Maven dependency ordering for branch
+1 💚	mvninstall	2m 13s		branch-2.6 passed
+1 💚	javadoc	0m 47s		branch-2.6 passed
			_ Patch Compile Tests _
+0 🆗	mvndep	0m 15s		Maven dependency ordering for patch
+1 💚	mvninstall	2m 7s		the patch passed
+1 💚	javadoc	0m 45s		the patch passed
			_ Other Tests _
+1 💚	unit	188m 19s		hbase-server in the patch passed.
+1 💚	unit	7m 44s		hbase-thrift in the patch passed.
		207m 35s

Subsystem	Report/Notes
Docker	ClientAPI=1.47 ServerAPI=1.47 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6550/1/artifact/yetus-jdk8-hadoop2-check/output/Dockerfile
GITHUB PR	#6550
Optional Tests	javac javadoc unit
uname	Linux cce46f069979 5.4.0-200-generic #220-Ubuntu SMP Fri Sep 27 13:19:16 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux
Build tool	maven
Personality	dev-support/hbase-personality.sh
git revision	branch-2.6 / `59d05d6`
Default Java	Temurin-1.8.0_412-b08
Test Results	https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6550/1/testReport/
Max. process+thread count	4418 (vs. ulimit of 30000)
modules	C: hbase-server hbase-thrift U: .
Console output	https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6550/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.

Apache-HBase · 2024-12-18T11:19:04Z

💔 -1 overall

Vote	Subsystem	Runtime	Logfile	Comment
+0 🆗	reexec	0m 41s		Docker mode activated.
-0 ⚠️	yetus	0m 5s		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.6 Compile Tests _
+0 🆗	mvndep	0m 13s		Maven dependency ordering for branch
+1 💚	mvninstall	3m 25s		branch-2.6 passed
+1 💚	javadoc	0m 44s		branch-2.6 passed
			_ Patch Compile Tests _
+0 🆗	mvndep	0m 17s		Maven dependency ordering for patch
+1 💚	mvninstall	3m 5s		the patch passed
+1 💚	javadoc	0m 41s		the patch passed
			_ Other Tests _
-1 ❌	unit	192m 26s	/patch-unit-hbase-server.txt	hbase-server in the patch failed.
+1 💚	unit	7m 18s		hbase-thrift in the patch passed.
		213m 18s

Subsystem	Report/Notes
Docker	ClientAPI=1.43 ServerAPI=1.43 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6550/1/artifact/yetus-jdk11-hadoop3-check/output/Dockerfile
GITHUB PR	#6550
Optional Tests	javac javadoc unit
uname	Linux 5fe0462c0e77 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.6 / `59d05d6`
Default Java	Eclipse Adoptium-11.0.23+9
Test Results	https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6550/1/testReport/
Max. process+thread count	4079 (vs. ulimit of 30000)
modules	C: hbase-server hbase-thrift U: .
Console output	https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6550/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.

NihalJain · 2024-12-19T05:59:45Z

Hi @PDavid please let me know once this PR is ready for review

PDavid · 2024-12-19T08:40:17Z

Hi @NihalJain,
Many thanks, I think this is now ready to review. Some tests failed in the PR build but I think they are not related.

NihalJain

This PR is 1st 2 commits (new) + rest commits same as #6551.

Changes LGTM, let me spin off a single node and do basic sanity of the web UI.

NihalJain · 2024-12-24T07:10:01Z

Results of local testings:

Thrift UI: LGTM
Rest UI: Broken, needs to fix, unable to load static resources

Master UI: LGTM, there a issue with navbar but should be fine as we will anyways bump bootstrap here

NihalJain

Rest ui needs a fix

Apache9 · 2024-12-25T02:17:08Z

Results of local testings:
Thrift UI: LGTM
Rest UI: Broken, needs to fix, unable to load static resources
* Master UI: LGTM, there a issue with navbar but should be fine as we will anyways bump bootstrap here

Oh, I haven't checked the rest ui while testing the branch-2 patch... Maybe we have the same problem for branch-2...

PDavid · 2025-01-06T07:27:06Z

Many thanks @NihalJain for testing this. 👍
Yes, you are right that the REST UI is broken (static resources are not loaded). For this I already created another Jira some time ago: https://issues.apache.org/jira/browse/HBASE-28983

Would you like if I fix this under this Jira and PR or would you prefer having the fix under the separate Jira. Both are OK for me.

PDavid · 2025-01-06T09:28:52Z

I found one possible fix for the REST UI is broken (static resources are not loaded) issue: copy the static resources folder under hbase-rest/src/main/resources/hbase-webapps.

I'd prefer to fix it after the Bootstrap upgrade is merged as otherwise it has to be copied again with the new CSS, JS files.

NihalJain · 2025-01-06T09:41:37Z

I found one possible fix for the REST UI is broken (static resources are not loaded) issue: copy the static resources folder under hbase-rest/src/main/resources/hbase-webapps.
I'd prefer to fix it after the Bootstrap upgrade is merged as otherwise it has to be copied again with the new CSS, JS files.

Sure sounds good.

NihalJain · 2025-01-06T11:14:49Z

@PDavid We are good to merge this right? Should I go ahead now?

PDavid · 2025-01-06T12:20:57Z

@NihalJain I think this should be finished but let me do another round of testing just to make sure.

Will comment again when done.

NihalJain · 2025-01-07T05:25:08Z

Dropped a mail on dev thread to decide on whether we want to take this and other related changes in before the upcoming release. https://lists.apache.org/thread/1srh98tymv79zdh7fwkljddd6bd0rntt

FYI @PDavid

CC: #6526

PDavid · 2025-01-07T10:04:30Z

@NihalJain I think this should be finished but let me do another round of testing just to make sure.
Will comment again when done.

@NihalJain OK, I tested this, looks good to me. Of course let's wait the dev discussion if we need this in the release.

NihalJain · 2025-01-08T05:00:17Z

We already have a go ahead for this; thanks to @Apache9 and @apurtell on mail thread.
Hi, @PDavid Please let me know if this is good to merge today!

NihalJain · 2025-01-08T10:42:02Z

We already have a go ahead for this; thanks to @Apache9 and @apurtell on mail thread. Hi, @PDavid Please let me know if this is good to merge today!

@PDavid We are good here as well right? I will merge this first and then #6542 now

PDavid · 2025-01-08T11:48:19Z

We already have a go ahead for this; thanks to @Apache9 and @apurtell on mail thread. Hi, @PDavid Please let me know if this is good to merge today!
@PDavid We are good here as well right? I will merge this first and then #6542 now

@NihalJain yes, many thanks, I think this is ready to be merged.

bea0113and others added 5 commits December 18, 2024 08:27

HBASE-18382 add transport type info into Thrift UI (apache#880)
3b3cb5d
Signed-off-by: Wellington Chevreuil <wchevreuil@apache.org> Signed-off-by: Bharath Vissapragada <bharathv@apache.org> Signed-off-by: Viraj Jasani <virajjasani007@gmail.com> (cherry picked from commit 82e155e)

HBASE-20693 Refactor thrift jsp's and extract header and footer (apac…
ed3ad95
…he#5732) - Fixes the way logLevel page renders in UI Signed-off-by: Nick Dimiduk <ndimiduk@apache.org> (cherry picked from commit ede4ccd)

HBASE-24624 Optimize table.jsp code (apache#1963)
fc28cee
Signed-off-by: Guangxu Cheng <gxcheng@apache.org> (cherry picked from commit 9ad16aa)

HBASE-25402 Sorting order by start key or end key is not considering …
9e4d233
…empty start key/end key (apache#2955) Signed-off-by: Duo Zhang <zhangduo@apache.org> Signed-off-by: Pankaj Kumar<pankajkumar@apache.org> (cherry picked from commit 157200e)

HBASE-28778 NPE may occur when opening master-status or table.jsp or …
59d05d6
…procedure.jsp while Master is initializing (apache#6152) Signed-off-by: Duo Zhang <zhangduo@apache.org> (cherry picked from commit 3caaf2d)

PDavid mentioned this pull request Dec 18, 2024
HBASE-29036 Backport missing UI patches to branch-2.6 #6546
Closed

PDavid marked this pull request as ready for review December 19, 2024 08:39

NihalJain approved these changes Dec 24, 2024
View reviewed changes

NihalJain requested changes Dec 24, 2024
View reviewed changes

PDavid requested a review from NihalJain January 6, 2025 11:04

NihalJain approved these changes Jan 6, 2025
View reviewed changes

PDavid marked this pull request as draft January 6, 2025 13:56

PDavid mentioned this pull request Jan 7, 2025
HBASE-28832 Upgrade from bootstrap 3.4.1 to non vulnerable version 5.3.3 #6526
Merged

PDavid marked this pull request as ready for review January 7, 2025 16:11

apurtell mentioned this pull request Jan 7, 2025
HBASE-29028 Backport missing UI patches to branch-2.5 #6542
Merged

apurtell approved these changes Jan 7, 2025
View reviewed changes

NihalJain merged commit a5367b8 into apache:branch-2.6Jan 8, 2025

PDavid deleted the HBASE-29036-UI-missing-patches-branch-2.6 branch January 8, 2025 12:24

Uh oh!

Conversation

PDavid commented Dec 18, 2024

Uh oh!

Apache-HBase commented Dec 18, 2024

Uh oh!

Apache-HBase commented Dec 18, 2024

Uh oh!

Apache-HBase commented Dec 18, 2024

Uh oh!

Apache-HBase commented Dec 18, 2024

Uh oh!

NihalJain commented Dec 19, 2024

Uh oh!

PDavid commented Dec 19, 2024

Uh oh!

NihalJain left a comment

Choose a reason for hiding this comment

Uh oh!

NihalJain commented Dec 24, 2024• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

NihalJain left a comment

Choose a reason for hiding this comment

Uh oh!

Apache9 commented Dec 25, 2024

Uh oh!

PDavid commented Jan 6, 2025

Uh oh!

PDavid commented Jan 6, 2025

Uh oh!

NihalJain commented Jan 6, 2025• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

NihalJain commented Jan 6, 2025

Uh oh!

PDavid commented Jan 6, 2025

Uh oh!

NihalJain commented Jan 7, 2025• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PDavid commented Jan 7, 2025

Uh oh!

NihalJain commented Jan 8, 2025

Uh oh!

NihalJain commented Jan 8, 2025

Uh oh!

PDavid commented Jan 8, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

NihalJain commented Dec 24, 2024•
edited
Loading

NihalJain commented Jan 6, 2025•
edited
Loading

NihalJain commented Jan 7, 2025•
edited
Loading