HDDS-11071. [hsync] 8th merge from master#6915
Merged
smengcl merged 98 commits intoapache:HDDS-7593from Jul 8, 2024
Merged
Conversation
…from NotReplicatedException (apache#6879)
…a 9+, running with Java 8 (apache#6897)
Conflicts: .github/workflows/build-ratis.yml .mvn/extensions.xml hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/storage/DummyBlockInputStream.java hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/BlockManagerImpl.java hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/CertificateServer.java hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultCAServer.java hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/authority/TestDefaultCAServer.java hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/security/RootCARotationManager.java hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/KeyInputStream.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestSecureOzoneRpcClient.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestContainerReplication.java hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeysDeleteRequest.java hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OmKeysDeleteRequestWithFSO.java hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/api/db.json hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/diskUsage/diskUsage.tsx pom.xml
smengcl
changed the title
jojochuang
approved these changes
Jul 8, 2024
Contributor
Author
|
Looking at test failures. https://github.com/apache/ozone/actions/runs/9844372941/job/27178008380?pr=6915#step:6:2657 https://github.com/apache/ozone/actions/runs/9844372941/job/27178010301?pr=6915#step:6:2704 |
Contributor
Author
|
Both flaky tests passed after retriggering. |
Contributor
Author
|
Pushed to feature branch. Thanks @jojochuang for the review. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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.
DO NOT merge from PR. For code review purpose only.
What changes were proposed in this pull request?
8th merge from master.
What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-11071
How was this patch tested?