This is an automated email from the ASF dual-hosted git repository. pifta pushed a commit to branch HDDS-5447-httpfs in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 90d947fe3f992624be7e0cd966ad014bfd433929 Merge: 56f104c 07b54e2 Author: Istvan Fajth <[email protected]> AuthorDate: Fri Nov 19 12:34:14 2021 +0100 Merge branch 'master' into HDDS-5447-httpfs .../common/src/main/resources/ozone-default.xml | 18 ++ .../container/replication/MeasuredReplicator.java | 34 +++- .../replication/ReplicationSupervisor.java | 1 - .../replication/ReplicationSupervisorMetrics.java | 1 - .../replication/TestMeasuredReplicator.java | 34 +++- .../java/org/apache/hadoop/hdds/ExitManager.java | 12 +- .../hdds/scm/container/ReplicationManager.java | 30 ++- .../replication/ReplicationManagerMetrics.java | 41 ++++ .../hdds/scm/container/TestReplicationManager.java | 10 + .../hdds/scm/cli/datanode/UsageInfoSubcommand.java | 41 +++- .../hadoop/ozone/client/io/OzoneInputStream.java | 33 +++- .../main/java/org/apache/hadoop/ozone/OmUtils.java | 82 ++++++++ .../org/apache/hadoop/ozone/om/OMConfigKeys.java | 11 ++ .../hadoop/ozone/om/helpers/OMNodeDetails.java | 50 ++++- .../apache/hadoop/ozone/om/helpers/OmKeyInfo.java | 8 + .../hadoop/ozone/om/protocol/OMAdminProtocol.java} | 25 ++- .../hadoop/ozone/om/protocol/OMConfiguration.java | 92 +++++++++ .../protocolPB/OMAdminProtocolClientSideImpl.java | 136 ++++++++++++++ .../ozone/om/protocolPB/OMAdminProtocolPB.java} | 22 ++- .../src/main/compose/ozonesecure-mr/docker-config | 3 + .../hadoop/fs/ozone/TestRootedOzoneFileSystem.java | 95 ++++++---- .../fs/ozone/TestRootedOzoneFileSystemWithFSO.java | 5 +- .../hadoop/ozone/MiniOzoneHAClusterImpl.java | 150 +++++++++++---- .../client/rpc/TestOzoneAtRestEncryption.java | 11 ++ .../hadoop/ozone/om/TestOzoneManagerBootstrap.java | 184 ++++++++++++++---- .../src/main/proto/OMAdminProtocol.proto | 65 +++++++ .../apache/hadoop/ozone/om/OMPolicyProvider.java | 5 +- .../apache/hadoop/ozone/om/OMStarterInterface.java | 2 +- .../org/apache/hadoop/ozone/om/OzoneManager.java | 208 ++++++++++++++++++--- .../hadoop/ozone/om/OzoneManagerStarter.java | 45 +++-- .../apache/hadoop/ozone/om/ha/OMHANodeDetails.java | 6 +- .../ozone/om/ratis/OzoneManagerRatisServer.java | 24 +-- .../S3MultipartUploadCompleteRequest.java | 11 ++ .../protocolPB/OMAdminProtocolServerSideImpl.java | 66 +++++++ .../hadoop/ozone/om/TestOzoneManagerStarter.java | 4 +- .../hadoop/ozone/s3/endpoint/ObjectEndpoint.java | 10 +- .../hadoop/ozone/s3/io/S3WrapperInputStream.java | 84 --------- 37 files changed, 1343 insertions(+), 316 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
