Skip to content

Backport "HBASE-20693 Refactor thrift jsp's and extract header and footer" to branch-2 - #5737

Merged
NihalJain merged 1 commit into
apache:branch-2from
NihalJain:HBASE-20693_branch_2
Sep 27, 2024
Merged

Backport "HBASE-20693 Refactor thrift jsp's and extract header and footer" to branch-2#5737
NihalJain merged 1 commit into
apache:branch-2from
NihalJain:HBASE-20693_branch_2

Conversation

@NihalJain

@NihalJainNihalJain commented Mar 1, 2024

Copy link
Copy Markdown
Contributor

No description provided.

@NihalJainNihalJain added the backport This PR is a back port of some issue or issues already committed to master label Mar 1, 2024
@NihalJain

NihalJain commented Mar 1, 2024

Copy link
Copy Markdown
ContributorAuthor

#5732 did not apply cleanly to branch-2 as HBASE-18382 is missing there.

For now raised a backport for the same with this PR. Just copied the 3 files from branch-3 and overwrote on branch-2.

Verified the UI loads as expected:
Screenshot 2024-03-01 at 7 26 27 PM

Let me know if i should:

  • avoid backporting HBASE-18382 altogether?
  • raise HBASE-18382 as another PR, and not mix with this?
  • Or are we good this way?

What are your thoughts @ndimiduk ?

@Apache-HBase

This comment has been minimized.

@Apache-HBase

This comment has been minimized.

@Apache-HBase

This comment has been minimized.

@ndimiduk

Copy link
Copy Markdown
Member

My preference is to re-open for backport any missing dependencies -- if possible. Sometimes that doesn't go smoothly. In this case, I think it's fine to backport HBASE-18382 before proceeding with 20693.

@NihalJain

Copy link
Copy Markdown
ContributorAuthor

My preference is to re-open for backport any missing dependencies -- if possible. Sometimes that doesn't go smoothly. In this case, I think it's fine to backport HBASE-18382 before proceeding with 20693.

Raised #6312

…he#5732)
- Fixes the way logLevel page renders in UI
Signed-off-by: Nick Dimiduk <ndimiduk@apache.org>
(cherry picked from commit ede4ccd)
@NihalJainNihalJain changed the title Backport "HBASE-20693 Refactor thrift jsp's and extract header and fo…Backport "HBASE-20693 Refactor thrift jsp's and extract header and footer" to branch-2Sep 27, 2024
@NihalJain

NihalJain commented Sep 27, 2024

Copy link
Copy Markdown
ContributorAuthor

The patch applies cleanly now, since HBASE-18382 is already in. Cherrypicked ede4ccd !

@Apache-HBase

Copy link
Copy Markdown

🎊 +1 overall

VoteSubsystemRuntimeLogfileComment
+0 🆗reexec0m 39sDocker mode activated.
_ Prechecks _
+1 💚dupname0m 0sNo case conflicting files found.
+0 🆗codespell0m 0scodespell was not available.
+0 🆗detsecrets0m 0sdetect-secrets was not available.
+1 💚@author0m 0sThe patch does not contain any @author tags.
_ branch-2 Compile Tests _
+1 💚mvninstall3m 22sbranch-2 passed
+1 💚spotless0m 47sbranch has no errors when running spotless:check.
_ Patch Compile Tests _
+1 💚mvninstall3m 7sthe patch passed
+1 💚blanks0m 0sThe patch has no blanks issues.
+1 💚spotless0m 46spatch has no errors when running spotless:check.
_ Other Tests _
+1 💚asflicense0m 10sThe patch does not generate ASF License warnings.
10m 20s
SubsystemReport/Notes
DockerClientAPI=1.43 ServerAPI=1.43 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-5737/2/artifact/yetus-general-check/output/Dockerfile
GITHUB PR#5737
Optional Testsdupname asflicense javac codespell detsecrets spotless
unameLinux 76642e39d075 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 / 4b94567
Default JavaEclipse Adoptium-11.0.23+9
Max. process+thread count79 (vs. ulimit of 30000)
modulesC: hbase-thrift U: hbase-thrift
Console outputhttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-5737/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 42sDocker mode activated.
-0 ⚠️yetus0m 5sUnprocessed 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 💚mvninstall2m 36sbranch-2 passed
+1 💚javadoc0m 22sbranch-2 passed
_ Patch Compile Tests _
+1 💚mvninstall2m 25sthe patch passed
+1 💚javadoc0m 20sthe patch passed
_ Other Tests _
+1 💚unit6m 43shbase-thrift in the patch passed.
14m 17s
SubsystemReport/Notes
DockerClientAPI=1.43 ServerAPI=1.43 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-5737/2/artifact/yetus-jdk8-hadoop2-check/output/Dockerfile
GITHUB PR#5737
Optional Testsjavac javadoc unit
unameLinux 3e8f5505278e 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 / 4b94567
Default JavaTemurin-1.8.0_412-b08
Test Resultshttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-5737/2/testReport/
Max. process+thread count1359 (vs. ulimit of 30000)
modulesC: hbase-thrift U: hbase-thrift
Console outputhttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-5737/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 53sDocker 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 Compile Tests _
+1 💚mvninstall3m 38sbranch-2 passed
+1 💚javadoc0m 22sbranch-2 passed
_ Patch Compile Tests _
+1 💚mvninstall3m 4sthe patch passed
+1 💚javadoc0m 20sthe patch passed
_ Other Tests _
+1 💚unit8m 14shbase-thrift in the patch passed.
17m 38s
SubsystemReport/Notes
DockerClientAPI=1.47 ServerAPI=1.47 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-5737/2/artifact/yetus-jdk17-hadoop3-check/output/Dockerfile
GITHUB PR#5737
Optional Testsjavac javadoc unit
unameLinux 1a6818dec51e 5.4.0-195-generic #215-Ubuntu SMP Fri Aug 2 18:28:05 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux
Build toolmaven
Personalitydev-support/hbase-personality.sh
git revisionbranch-2 / 4b94567
Default JavaEclipse Adoptium-17.0.11+9
Test Resultshttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-5737/2/testReport/
Max. process+thread count1389 (vs. ulimit of 30000)
modulesC: hbase-thrift U: hbase-thrift
Console outputhttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-5737/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 🆗reexec1m 8sDocker mode activated.
-0 ⚠️yetus0m 7sUnprocessed 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 💚mvninstall5m 4sbranch-2 passed
+1 💚javadoc0m 34sbranch-2 passed
_ Patch Compile Tests _
+1 💚mvninstall5m 0sthe patch passed
+1 💚javadoc0m 38sthe patch passed
_ Other Tests _
+1 💚unit7m 51shbase-thrift in the patch passed.
21m 49s
SubsystemReport/Notes
DockerClientAPI=1.43 ServerAPI=1.43 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-5737/2/artifact/yetus-jdk11-hadoop3-check/output/Dockerfile
GITHUB PR#5737
Optional Testsjavac javadoc unit
unameLinux a4cf75d29001 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 / 4b94567
Default JavaEclipse Adoptium-11.0.23+9
Test Resultshttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-5737/2/testReport/
Max. process+thread count1451 (vs. ulimit of 30000)
modulesC: hbase-thrift U: hbase-thrift
Console outputhttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-5737/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.

@NihalJain

Copy link
Copy Markdown
ContributorAuthor

Verified the changes locally.
Before
Screenshot 2024-09-27 at 12 09 39 PM
After
Screenshot 2024-09-27 at 6 22 03 PM

@NihalJain
NihalJain merged commit 0d19b9b into apache:branch-2Sep 27, 2024
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.

3 participants

@NihalJain@Apache-HBase@ndimiduk