HDDS-5046. Merge master with SCM HA changes into HDDS-3698-upgrade branch. #2102
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
Contributed-by: Li Cheng <timmycheng@tencent.com>
Co-authored-by: Li Cheng <timmycheng@tencent.com>
…pache#959) * HDDS-3186. Initial version. * HDDS-3186. Additional changes.
Co-authored-by: Li Cheng <timmycheng@tencent.com>
…se. (apache#1016) Merge in. Thanks @nandakumar131 for the contribution
…sactionContext.getClientRequest().
…opied from OM HA.
…ocationProtocolPB.class in RPC.setProtocolEngine.
…niOzone cluster testing).
|
cc @errose28 for review. |
|
The failures are only in csi acceptance tests which seem unrelated and are also present in master (https://github.com/apache/ozone/pull/2105/checks?check_run_id=2245483036) |
|
LGTM +1 pending CI |
|
CI is clean. Going ahead with the merge. |
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.
What changes were proposed in this pull request?
Merge master with SCM HA changes into upgrade branch.
What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-5046
How was this patch tested?
Relying on existing tests, will need some follow up fixes to HDDS finalization logic.