This is an automated email from the ASF dual-hosted git repository. captainzmc pushed a commit to branch HDDS-4454 in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 362cc0fbf8cf8e04b30ad009c83795e4d67339f2 Merge: 8cd6873 839fc94 Author: captainzmc <[email protected]> AuthorDate: Mon Jul 26 10:55:14 2021 +0800 Merge remote-tracking branch 'origin/master' into HDDS-4454 .../hadoop/hdds/protocol/DatanodeDetails.java | 9 + .../common/src/main/resources/ozone-default.xml | 9 + .../common/volume/ImmutableVolumeSet.java | 16 + .../container/common/volume/MutableVolumeSet.java | 10 +- .../common/volume/StorageVolumeChecker.java | 9 +- .../ozone/container/common/volume/VolumeSet.java | 3 + .../common/volume/TestPeriodicVolumeChecker.java | 89 ++--- .../java/org/apache/hadoop/hdds/NodeDetails.java | 44 ++- hadoop-ozone/common/pom.xml | 4 + .../org/apache/hadoop/ozone/om/OMConfigKeys.java | 7 + .../ozone/om/ha/OMFailoverProxyProvider.java | 55 +-- .../hadoop/ozone/om/helpers}/OMNodeDetails.java | 86 ++++- .../ozone/om/protocol/OMInterServiceProtocol.java | 24 +- .../ozone/om/protocolPB/Hadoop3OmTransport.java | 2 +- .../OMInterServiceProtocolClientSideImpl.java | 121 +++++++ .../om/protocolPB/OMInterServiceProtocolPB.java | 38 +++ .../ozone/om/ha/TestOMFailoverProxyProvider.java | 7 +- .../apache/hadoop/ozone/MiniOzoneChaosCluster.java | 9 +- .../org/apache/hadoop/ozone/MiniOzoneCluster.java | 5 + .../apache/hadoop/ozone/MiniOzoneClusterImpl.java | 7 +- .../hadoop/ozone/MiniOzoneHAClusterImpl.java | 228 +++++++++++-- .../hadoop/ozone/MiniOzoneOMHAClusterImpl.java | 5 +- .../hadoop/ozone/om/TestOzoneManagerBootstrap.java | 216 ++++++++++++ .../ozone/om/TestOzoneManagerConfiguration.java | 2 +- .../apache/hadoop/ozone/om/TestOzoneManagerHA.java | 3 + .../src/main/proto/OmInterServiceProtocol.proto | 64 ++++ .../apache/hadoop/ozone/om/OMPolicyProvider.java | 4 + .../apache/hadoop/ozone/om/OMStarterInterface.java | 2 + .../org/apache/hadoop/ozone/om/OzoneManager.java | 377 +++++++++++++++------ .../hadoop/ozone/om/OzoneManagerStarter.java | 35 ++ .../apache/hadoop/ozone/om/ha/OMHANodeDetails.java | 11 +- .../ozone/om/ratis/OzoneManagerRatisServer.java | 377 +++++++++++++-------- .../ozone/om/ratis/OzoneManagerStateMachine.java | 30 ++ .../om/ratis/utils/OzoneManagerRatisUtils.java | 88 +++++ .../om/snapshot/OzoneManagerSnapshotProvider.java | 18 +- .../OMInterServiceProtocolServerSideImpl.java | 90 +++++ ...OzoneManagerProtocolServerSideTranslatorPB.java | 76 ++--- .../hadoop/ozone/om/TestOzoneManagerStarter.java | 6 + .../hadoop/ozone/om/failover/TestOMFailovers.java | 2 +- .../om/ratis/TestOzoneManagerRatisServer.java | 8 +- .../hadoop/fs/ozone/Hadoop27RpcTransport.java | 2 +- .../hadoop/ozone/recon/api/NodeEndpoint.java | 10 +- .../hadoop/ozone/recon/scm/ReconNodeManager.java | 106 +++++- .../src/views/datanodes/datanodes.tsx | 8 +- .../ozone/recon/scm/TestReconNodeManager.java | 38 +++ .../apache/hadoop/ozone/s3/util/ContinueToken.java | 15 +- .../hadoop/ozone/s3/util/TestContinueToken.java | 20 ++ pom.xml | 4 +- 48 files changed, 1971 insertions(+), 428 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
