Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Sep 27, 2024

Conversation

NihalJain
Copy link
Contributor

@NihalJain NihalJain commented Mar 1, 2024

No description provided.

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

NihalJain commented Mar 1, 2024

#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
Member

ndimiduk commented Mar 4, 2024

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
Contributor Author

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 <[email protected]>
(cherry picked from commit ede4ccd)
@NihalJain NihalJain 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-2 Sep 27, 2024
@NihalJain
Copy link
Contributor Author

NihalJain commented Sep 27, 2024

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

@Apache-HBase
Copy link

🎊 +1 overall

Vote Subsystem Runtime Logfile Comment
+0 🆗 reexec 0m 39s 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 3m 22s branch-2 passed
+1 💚 spotless 0m 47s branch has no errors when running spotless:check.
_ Patch Compile Tests _
+1 💚 mvninstall 3m 7s the patch passed
+1 💚 blanks 0m 0s The patch has no blanks issues.
+1 💚 spotless 0m 46s patch has no errors when running spotless:check.
_ Other Tests _
+1 💚 asflicense 0m 10s The patch does not generate ASF License warnings.
10m 20s
Subsystem Report/Notes
Docker ClientAPI=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 Tests dupname asflicense javac codespell detsecrets spotless
uname Linux 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 tool maven
Personality dev-support/hbase-personality.sh
git revision branch-2 / 4b94567
Default Java Eclipse Adoptium-11.0.23+9
Max. process+thread count 79 (vs. ulimit of 30000)
modules C: hbase-thrift U: hbase-thrift
Console output https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-5737/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
Copy link

🎊 +1 overall

Vote Subsystem Runtime Logfile Comment
+0 🆗 reexec 0m 42s 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 36s branch-2 passed
+1 💚 javadoc 0m 22s branch-2 passed
_ Patch Compile Tests _
+1 💚 mvninstall 2m 25s the patch passed
+1 💚 javadoc 0m 20s the patch passed
_ Other Tests _
+1 💚 unit 6m 43s hbase-thrift in the patch passed.
14m 17s
Subsystem Report/Notes
Docker ClientAPI=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 Tests javac javadoc unit
uname Linux 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 tool maven
Personality dev-support/hbase-personality.sh
git revision branch-2 / 4b94567
Default Java Temurin-1.8.0_412-b08
Test Results https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-5737/2/testReport/
Max. process+thread count 1359 (vs. ulimit of 30000)
modules C: hbase-thrift U: hbase-thrift
Console output https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-5737/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
Copy link

🎊 +1 overall

Vote Subsystem Runtime Logfile Comment
+0 🆗 reexec 0m 53s 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 3m 38s branch-2 passed
+1 💚 javadoc 0m 22s branch-2 passed
_ Patch Compile Tests _
+1 💚 mvninstall 3m 4s the patch passed
+1 💚 javadoc 0m 20s the patch passed
_ Other Tests _
+1 💚 unit 8m 14s hbase-thrift in the patch passed.
17m 38s
Subsystem Report/Notes
Docker ClientAPI=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 Tests javac javadoc unit
uname Linux 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 tool maven
Personality dev-support/hbase-personality.sh
git revision branch-2 / 4b94567
Default Java Eclipse Adoptium-17.0.11+9
Test Results https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-5737/2/testReport/
Max. process+thread count 1389 (vs. ulimit of 30000)
modules C: hbase-thrift U: hbase-thrift
Console output https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-5737/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
Copy link

🎊 +1 overall

Vote Subsystem Runtime Logfile Comment
+0 🆗 reexec 1m 8s 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 Compile Tests _
+1 💚 mvninstall 5m 4s branch-2 passed
+1 💚 javadoc 0m 34s branch-2 passed
_ Patch Compile Tests _
+1 💚 mvninstall 5m 0s the patch passed
+1 💚 javadoc 0m 38s the patch passed
_ Other Tests _
+1 💚 unit 7m 51s hbase-thrift in the patch passed.
21m 49s
Subsystem Report/Notes
Docker ClientAPI=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 Tests javac javadoc unit
uname Linux 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 tool maven
Personality dev-support/hbase-personality.sh
git revision branch-2 / 4b94567
Default Java Eclipse Adoptium-11.0.23+9
Test Results https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-5737/2/testReport/
Max. process+thread count 1451 (vs. ulimit of 30000)
modules C: hbase-thrift U: hbase-thrift
Console output https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-5737/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
Copy link
Contributor Author

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-2 Sep 27, 2024
1 check passed
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.

3 participants