HBASE-29037 Backport missing UI patches to branch-2 by PDavid · Pull Request #6551 · apache/hbase

PDavid · 2024-12-18T07:34:24Z

Cherry-picked the following patches which were missing on branch-2 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-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)
HBASE-20452 Master UI: Table merge button should validate required fields before submit

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)

…elds before submit Signed-off-by: tedyu <yuzhihong@gmail.com> (cherry picked from commit 6ce1136)

Apache-HBase · 2024-12-18T12:58:45Z

🎊 +1 overall

Vote	Subsystem	Runtime	Logfile	Comment
+0 🆗	reexec	0m 47s		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 Compile Tests _
+1 💚	mvninstall	2m 39s		branch-2 passed
+1 💚	spotless	0m 42s		branch has no errors when running spotless:check.
			_ Patch Compile Tests _
+1 💚	mvninstall	2m 36s		the patch passed
+1 💚	blanks	0m 0s		The patch has no blanks issues.
+1 💚	spotless	0m 41s		patch has no errors when running spotless:check.
			_ Other Tests _
+1 💚	asflicense	0m 11s		The patch does not generate ASF License warnings.
		8m 43s

Subsystem	Report/Notes
Docker	ClientAPI=1.47 ServerAPI=1.47 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6551/2/artifact/yetus-general-check/output/Dockerfile
GITHUB PR	#6551
Optional Tests	dupname asflicense javac codespell detsecrets spotless
uname	Linux 7874217ca65c 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 / `efc79d0`
Default Java	Eclipse Adoptium-11.0.23+9
Max. process+thread count	79 (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-6551/2/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-18T16:06:50Z

🎊 +1 overall

Vote	Subsystem	Runtime	Logfile	Comment
+0 🆗	reexec	0m 50s		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 Compile Tests _
+1 💚	mvninstall	2m 54s		branch-2 passed
+1 💚	javadoc	0m 25s		branch-2 passed
			_ Patch Compile Tests _
+1 💚	mvninstall	2m 49s		the patch passed
+1 💚	javadoc	0m 24s		the patch passed
			_ Other Tests _
+1 💚	unit	185m 5s		hbase-server in the patch passed.
		196m 43s

Subsystem	Report/Notes
Docker	ClientAPI=1.43 ServerAPI=1.43 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6551/2/artifact/yetus-jdk11-hadoop3-check/output/Dockerfile
GITHUB PR	#6551
Optional Tests	javac javadoc unit
uname	Linux fd5cfbf53ae2 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 / `efc79d0`
Default Java	Eclipse Adoptium-11.0.23+9
Test Results	https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6551/2/testReport/
Max. process+thread count	4134 (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-6551/2/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-18T16:08:27Z

🎊 +1 overall

Vote	Subsystem	Runtime	Logfile	Comment
+0 🆗	reexec	0m 50s		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 Compile Tests _
+1 💚	mvninstall	2m 44s		branch-2 passed
+1 💚	javadoc	0m 25s		branch-2 passed
			_ Patch Compile Tests _
+1 💚	mvninstall	2m 24s		the patch passed
+1 💚	javadoc	0m 24s		the patch passed
			_ Other Tests _
+1 💚	unit	186m 54s		hbase-server in the patch passed.
		198m 17s

Subsystem	Report/Notes
Docker	ClientAPI=1.43 ServerAPI=1.43 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6551/2/artifact/yetus-jdk8-hadoop2-check/output/Dockerfile
GITHUB PR	#6551
Optional Tests	javac javadoc unit
uname	Linux 2b7d012ee11d 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 / `efc79d0`
Default Java	Temurin-1.8.0_412-b08
Test Results	https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6551/2/testReport/
Max. process+thread count	4150 (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-6551/2/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-18T16:25:53Z

🎊 +1 overall

Vote	Subsystem	Runtime	Logfile	Comment
+0 🆗	reexec	0m 23s		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 Compile Tests _
+1 💚	mvninstall	2m 35s		branch-2 passed
+1 💚	javadoc	0m 28s		branch-2 passed
			_ Patch Compile Tests _
+1 💚	mvninstall	2m 39s		the patch passed
+1 💚	javadoc	0m 27s		the patch passed
			_ Other Tests _
+1 💚	unit	205m 4s		hbase-server in the patch passed.
		215m 53s

Subsystem	Report/Notes
Docker	ClientAPI=1.47 ServerAPI=1.47 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6551/2/artifact/yetus-jdk17-hadoop3-check/output/Dockerfile
GITHUB PR	#6551
Optional Tests	javac javadoc unit
uname	Linux a81bfaf70127 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 / `efc79d0`
Default Java	Eclipse Adoptium-17.0.11+9
Test Results	https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6551/2/testReport/
Max. process+thread count	4660 (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-6551/2/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:40Z

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

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

Hi @NihalJain,
Many thanks, I think this is now ready to review.

NihalJain · 2024-12-20T05:59:38Z

Reviewing commit by commit:

HBASE-24624 Optimize table.jsp code: TODO
- This change is huge wrt to original PR, @PDavid could you summarise what all we changed here? Is there a whitespace issue? Mind fixing it? Or are you doing this to align with Master?
HBASE-25402 Sorting order by start key or end key is not considering empty start key/end key -> LGTM
HBASE-28778 NPE may occur when opening master-status or table.jsp or procedure.jsp while Master is initializing: -> LGTM
- Apparently this was already backported with original ticket, we just missed a few files back then!
HBASE-20452 Master UI: Table merge button should validate required fields before submit -> LGTM

Also could you please summarise how the changes have been tested.

Apache9

I've tried to build a tarball with the PR and started a mini cluster locally, and run LTT to load some data, the page looks good.

Let's get this in and move on.

Thanks @PDavid !

NihalJain · 2024-12-24T06:11:25Z

Thanks @Apache9 for testing out. We can look if anything needs to be done for whitespace later. Skimmed commit 1, LGTM Merging this to codebase.

PDavid · 2025-01-06T10:18:12Z

Hi @NihalJain and @Apache9,

Many thanks for your reviews and tests. 🙏

Sorry, I was completely off in the holiday season.

HBASE-24624 Optimize table.jsp code: TODO
This change is huge wrt to original PR, @PDavid could you summarise what all we changed here? Is there a whitespace issue? Mind fixing it? Or are you doing this to align with Master?

The motivation behind these backport UI changes PR-s (and this specific backport you mention) is to align with master branch so that the Boostrap upgrade can be backported more cleanly.

Here the problem was that - if you check the history of table.jsp on master branch and on branch-2 - that this "Optimize table.jsp code" patch was missing from branch-2 but the newer patches were applied (backported) on branch-2. This made table.jsp quite different than it was when "Optimize table.jsp code" patch was merged to master branch.

So when I backported this change I was extra careful to not to "undo" the changes which newer backported patches did.

Also could you please summarise how the changes have been tested.

Sure. I built the project in dev mode with mvn clean install -DskipTests -Dhadoop.profile=3.0 then started HBase locally with bin/start-hbase.sh in standalone mode. Created some tables with some rows and checked the Master UI, region server UI.
Started Thrift server (bin/hbase thrift start -p 8081) and REST server (bin/hbase rest start -p 8080) and checked their UI respectively.

To properly verify the REST UI I had to copy the static resources folder under hbase-rest/src/main/resources/hbase-webapps folder because of the REST UI is broken (static resources are not loaded) https://issues.apache.org/jira/browse/HBASE-28983 issue - but this change I did not committed as there is a separate Jira.

Hope this answers your question.

Any suggestions maybe in regards to testing?

NihalJain · 2025-01-06T10:57:06Z

Thanks @PDavid for the response, I think we are good here.

* HBASE-24624 Optimize table.jsp code (apache#1963) 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 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 procedure.jsp while Master is initializing (apache#6152) Signed-off-by: Duo Zhang <zhangduo@apache.org> (cherry picked from commit 3caaf2d) * HBASE-20452 Master UI: Table merge button should validate required fields before submit Signed-off-by: tedyu <yuzhihong@gmail.com> (cherry picked from commit 6ce1136) --------- Co-authored-by: xincunSong <365724453@qq.com> Co-authored-by: Akshay Sudheer <74921542+AkshayTSudheer@users.noreply.github.com> Co-authored-by: Peng Lu <lupeng_nwpu@qq.com> Co-authored-by: Nihal Jain <nihaljain.cs@gmail.com> Signed-off-by: Duo Zhang <zhangduo@apache.org> Signed-off-by: Nihal Jain <nihaljain.cs@gmail.com>

songxincunand others added 4 commits December 18, 2024 08:33

HBASE-24624 Optimize table.jsp code (apache#1963)
3a16579
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 …
57df7d0
…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 …
cd0d57b
…procedure.jsp while Master is initializing (apache#6152) Signed-off-by: Duo Zhang <zhangduo@apache.org> (cherry picked from commit 3caaf2d)

HBASE-20452 Master UI: Table merge button should validate required fi…
efc79d0
…elds before submit Signed-off-by: tedyu <yuzhihong@gmail.com> (cherry picked from commit 6ce1136)

PDavid mentioned this pull request Dec 18, 2024
HBASE-29028 Backport missing UI patches to branch-2 #6548
Closed

This comment has been minimized.
Sign in to view

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

Apache9 approved these changes Dec 23, 2024
View reviewed changes

NihalJain approved these changes Dec 24, 2024
View reviewed changes

NihalJain merged commit cd6f224 into apache:branch-2Dec 24, 2024

This was referenced Dec 24, 2024
HBASE-29036 Backport missing UI patches to branch-2.6 #6550
Merged
HBASE-28832 Upgrade from bootstrap 3.4.1 to non vulnerable version 5.3.3 #6524
Merged

PDavid deleted the HBASE-29037-UI-missing-patches-branch-2 branch January 6, 2025 11:02

Navigation Menu

Uh oh!

HBASE-29037 Backport missing UI patches to branch-2 - #6551

HBASE-29037 Backport missing UI patches to branch-2#6551
NihalJain merged 4 commits into
apache:branch-2from
PDavid:HBASE-29037-UI-missing-patches-branch-2

PDavid commented Dec 18, 2024

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

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 commented Dec 20, 2024•
edited
Loading

Uh oh!

Apache9 left a comment

Uh oh!

NihalJain commented Dec 24, 2024

Uh oh!

PDavid commented Jan 6, 2025

Uh oh!

NihalJain commented Jan 6, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Uh oh!

Conversation

PDavid commented Dec 18, 2024

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

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 commented Dec 20, 2024• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Apache9 left a comment

Choose a reason for hiding this comment

Uh oh!

NihalJain commented Dec 24, 2024

Uh oh!

PDavid commented Jan 6, 2025

Uh oh!

NihalJain commented Jan 6, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

NihalJain commented Dec 20, 2024•
edited
Loading