HBASE-26523 + HBASE-25465 + HBASE-26855 backport to branch-2.4 #4439
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: GeorryHuang <[email protected]>
…ompilation (apache#4164) Signed-off-by: Andrew Purtell <[email protected]>
…#4236) Signed-off-by: Duo Zhang <[email protected]>
|
💔 -1 overall
This message was automatically generated. |
virajjasani
changed the title
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
apurtell
requested changes
May 17, 2022
There was a problem hiding this comment.
I think these changes are important to isolate our use of Jersey and Jetty from our upstreams and downstreams and I cannot find anything in the compatibility guidelines (https://hbase.apache.org/book.html#hbase.versioning) that recommends against this or forbids it.
However, there are a few files where you seem to have picked up extraneous changes and while I think they are harmless those hunks should be dropped as out of scope.
| @@ -22,6 +22,7 @@ | |||
| import org.apache.hadoop.hbase.io.hfile.BlockCacheKey; | |||
| import org.apache.yetus.audience.InterfaceAudience; | |||
|
|
|||
| import org.apache.hbase.thirdparty.com.google.common.base.Preconditions; | |||
There was a problem hiding this comment.
All the changes in this file seem extraneous?
Perhaps the findbugs exclusion can make a difference in the precommit report, but overall these changes come from somewhere other than the thirdparty changes?
There was a problem hiding this comment.
This is also part of the backport only (here)
| @@ -20,6 +20,7 @@ | |||
| import org.apache.hadoop.hbase.io.HeapSize; | |||
| import org.apache.yetus.audience.InterfaceAudience; | |||
|
|
|||
| import org.apache.hbase.thirdparty.com.google.common.base.Preconditions; | |||
There was a problem hiding this comment.
All the changes in this file seem extraneous?
Perhaps the whitespace change will avoid a spotless warning and findbugs exclusion can make a difference in the precommit report, but overall these changes come from somewhere other than the thirdparty changes?
There was a problem hiding this comment.
These changes are also part of HBASE-26523 backport here
There was a problem hiding this comment.
Since it is not a merge issue, fine
| @@ -203,41 +203,37 @@ private String opWithClientMeterName(Object op) { | |||
| return ""; | |||
| } | |||
| MetaTableOps ops = opsNameMap.get(op.getClass()); | |||
| String opWithClientMeterName = ""; | |||
| if (ops == null) { | |||
There was a problem hiding this comment.
The changes in this file are all unrelated.
There was a problem hiding this comment.
These changes are part of backporting HBASE-26523 here: e53712a#diff-d10bebcd73c23f3ecb0565d7854f9a5659d33bf62baee31090ce6ef1ec224998R209-R211
|
💔 -1 overall
This message was automatically generated. |
|
The test failure TestMultiRespectsLimits.testBlockMultiLimits does not seem related but all tests in |
|
💔 -1 overall
This message was automatically generated. |
Yes, the tests are successful. I am re-running again after the latest spotless apply to confirm the results. |
|
@apurtell Yes all the tests of http and rest are passing locally (except |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
Same result here. |
apurtell
approved these changes
May 18, 2022
| @@ -20,6 +20,7 @@ | |||
| import org.apache.hadoop.hbase.io.HeapSize; | |||
| import org.apache.yetus.audience.InterfaceAudience; | |||
|
|
|||
| import org.apache.hbase.thirdparty.com.google.common.base.Preconditions; | |||
There was a problem hiding this comment.
Since it is not a merge issue, fine
|
Thanks @apurtell |
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
We have clean test report https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-4439/6/testReport/ |
|
Given the conflict with the recent commits on branch-2.4, instead of cherry-picking single commits, let me squash and merge this PR. Will reopen and close the affected Jiras with updated fixVersions. |
virajjasani
changed the title
vinayakphegde
pushed a commit
to vinayakphegde/hbase
that referenced
this pull request
Apr 4, 2024
…e#4439) * HBASE-26523 Upgrade hbase-thirdparty dependency to 4.0.1 (apache#3988) Signed-off-by: GeorryHuang <[email protected]> * HBASE-25465 Use javac --release option for supporting cross version compilation (apache#4164) Signed-off-by: Andrew Purtell <[email protected]> * HBASE-26855 Delete unnecessary dependency on jaxb-runtime jar (apache#4236) Signed-off-by: Duo Zhang <[email protected]> * spotless apply Co-authored-by: Duo Zhang <[email protected]> Co-authored-by: Nick Dimiduk <[email protected]> Signed-off-by: Andrew Purtell <[email protected]> (cherry picked from commit 91a44f5) Change-Id: I32d8a4fc4f7da7e24ce82d1d90cc9f22b4238599
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.