This is an automated email from the ASF dual-hosted git repository. adoroszlai pushed a commit to branch HDDS-6030 in repository https://gitbox.apache.org/repos/asf/ozone.git
commit c1790ce8f9239a20b618135aa66b5ee07b24380e Merge: cf6c985 d09cdd4 Author: Doroszlai, Attila <[email protected]> AuthorDate: Wed Jan 12 17:13:14 2022 +0100 Merge remote-tracking branch 'origin/master' into HDDS-6030 .../hadoop/hdds/scm/storage/BlockInputStream.java | 2 +- hadoop-hdds/common/pom.xml | 15 + .../hadoop/hdds/conf/OzoneConfiguration.java | 3 +- .../apache/hadoop/hdds/scm/client/ScmClient.java | 4 +- .../protocol/StorageContainerLocationProtocol.java | 6 +- .../java/org/apache/hadoop/ozone/OzoneConsts.java | 2 +- .../common/src/main/resources/ozone-default.xml | 35 + .../hadoop/hdds/conf/TestOzoneConfiguration.java | 28 + .../hadoop/hdds/tracing/TestStringCodec.java | 18 +- .../common/statemachine/DatanodeConfiguration.java | 32 - .../common/statemachine/DatanodeStateMachine.java | 5 +- .../container/replication/ReplicationServer.java | 54 +- .../replication/ReplicationSupervisor.java | 8 + .../statemachine/TestDatanodeConfiguration.java | 11 - .../replication/TestReplicationConfig.java | 75 ++ ...inerLocationProtocolClientSideTranslatorPB.java | 48 +- .../src/main/proto/ScmAdminProtocol.proto | 17 +- .../hdds/scm/container/ContainerReplicaCount.java | 10 + .../hdds/scm/container/ReplicationManager.java | 62 +- .../scm/container/ReplicationManagerReport.java | 192 +++++ .../scm/container/balancer/ContainerBalancer.java | 51 +- .../balancer/ContainerBalancerConfiguration.java | 127 +-- .../replication/ReplicationManagerMetrics.java | 42 + .../hadoop/hdds/scm/ha/SCMHAManagerImpl.java | 34 +- .../apache/hadoop/hdds/scm/ha/SCMStateMachine.java | 4 +- ...inerLocationProtocolServerSideTranslatorPB.java | 45 +- .../hdds/scm/server/SCMClientProtocolServer.java | 43 +- .../server/StorageContainerManagerHttpServer.java | 4 +- .../hdds/scm/container/TestReplicationManager.java | 161 +++- .../container/TestReplicationManagerReport.java | 113 +++ .../container/balancer/TestContainerBalancer.java | 99 ++- .../replication/TestReplicationManagerMetrics.java | 97 +++ .../states/TestContainerReplicaCount.java | 10 + .../hdds/scm/cli/ContainerBalancerCommands.java | 19 +- .../scm/cli/ContainerBalancerStartSubcommand.java | 50 +- .../hdds/scm/cli/ContainerOperationClient.java | 6 +- .../datanode/TestContainerBalancerSubCommand.java | 8 +- hadoop-ozone/client/pom.xml | 4 + .../ozone/client/BaseFileChecksumHelper.java | 198 +++++ .../ozone/client/ReplicatedFileChecksumHelper.java | 181 ++++ .../hadoop/ozone/client/io/KeyInputStream.java | 8 +- .../apache/hadoop/ozone/client/rpc/RpcClient.java | 4 + .../client/TestReplicatedFileChecksumHelper.java | 230 ++++++ .../client/src/test/resources/log4j.properties | 23 - .../hadoop/ozone/om/helpers/OMNodeDetails.java | 6 +- .../dist/src/main/compose/ozone-csi/docker-config | 1 + .../dist/src/main/compose/ozone/docker-config | 1 + .../compose/ozonesecure-ha/keytabs/HTTP.keytab | Bin 144 -> 0 bytes .../main/compose/ozonesecure-ha/keytabs/dn.keytab | Bin 278 -> 0 bytes .../main/compose/ozonesecure-ha/keytabs/om.keytab | Bin 278 -> 0 bytes .../compose/ozonesecure-ha/keytabs/recon.keytab | Bin 296 -> 0 bytes .../main/compose/ozonesecure-ha/keytabs/s3g.keytab | Bin 434 -> 0 bytes .../main/compose/ozonesecure-ha/keytabs/scm.keytab | Bin 586 -> 0 bytes .../compose/ozonesecure-ha/keytabs/testuser.keytab | Bin 152 -> 0 bytes .../ozonesecure-ha/keytabs/testuser2.keytab | Bin 154 -> 0 bytes .../src/main/compose/ozonesecure-mr/docker-config | 1 + .../compose/ozonesecure-mr/keytabs/HTTP.keytab | Bin 144 -> 0 bytes .../main/compose/ozonesecure-mr/keytabs/dn.keytab | Bin 278 -> 0 bytes .../main/compose/ozonesecure-mr/keytabs/om.keytab | Bin 278 -> 0 bytes .../compose/ozonesecure-mr/keytabs/recon.keytab | Bin 296 -> 0 bytes .../main/compose/ozonesecure-mr/keytabs/s3g.keytab | Bin 434 -> 0 bytes .../main/compose/ozonesecure-mr/keytabs/scm.keytab | Bin 586 -> 0 bytes .../compose/ozonesecure-mr/keytabs/testuser.keytab | Bin 152 -> 0 bytes .../ozonesecure-mr/keytabs/testuser2.keytab | Bin 154 -> 0 bytes .../src/main/compose/ozonesecure/docker-config | 1 + .../main/compose/ozonesecure/keytabs/HTTP.keytab | Bin 144 -> 0 bytes .../src/main/compose/ozonesecure/keytabs/dn.keytab | Bin 278 -> 0 bytes .../src/main/compose/ozonesecure/keytabs/om.keytab | Bin 278 -> 0 bytes .../main/compose/ozonesecure/keytabs/recon.keytab | Bin 296 -> 0 bytes .../main/compose/ozonesecure/keytabs/s3g.keytab | Bin 434 -> 0 bytes .../main/compose/ozonesecure/keytabs/scm.keytab | Bin 586 -> 0 bytes .../compose/ozonesecure/keytabs/testuser.keytab | Bin 152 -> 0 bytes .../compose/ozonesecure/keytabs/testuser2.keytab | Bin 154 -> 0 bytes .../contract/ITestOzoneContractDistCpWithFSO.java | 65 ++ .../hadoop/fs/ozone/contract/OzoneContract.java | 18 +- .../ozone/TestContainerBalancerOperations.java | 19 +- .../apache/hadoop/ozone/om/TestKeyManagerImpl.java | 361 ++++---- .../ozone/recon/TestReconWithOzoneManagerHA.java | 4 +- .../org/apache/hadoop/ozone/om/KeyManager.java | 111 --- .../org/apache/hadoop/ozone/om/KeyManagerImpl.java | 912 --------------------- .../hadoop/ozone/om/OzoneManagerHttpServer.java | 4 +- .../apache/hadoop/ozone/om/fs/OzoneManagerFS.java | 6 - .../org/apache/hadoop/ozone/om/OmTestManagers.java | 122 +++ .../hadoop/ozone/om/TestKeyDeletingService.java | 75 +- .../apache/hadoop/ozone/om/TestKeyManagerUnit.java | 56 +- .../apache/hadoop/ozone/om/TestTrashService.java | 34 +- .../security/acl/TestOzoneNativeAuthorizer.java | 77 +- .../hadoop/ozone/security/acl/TestParentAcl.java | 44 +- .../hadoop/ozone/security/acl/TestVolumeOwner.java | 41 +- .../apache/hadoop/ozone/recon/ReconConstants.java | 2 + .../hadoop/ozone/recon/ReconServerConfigKeys.java | 16 + .../ozone/recon/fsck/ContainerHealthTask.java | 2 +- .../hadoop/ozone/recon/scm/ReconNodeManager.java | 5 + .../scm/ReconStorageContainerManagerFacade.java | 129 ++- .../recon/spi/StorageContainerServiceProvider.java | 12 + .../spi/impl/OzoneManagerServiceProviderImpl.java | 8 +- .../impl/StorageContainerServiceProviderImpl.java | 107 ++- .../TestStorageContainerServiceProviderImpl.java | 12 + .../hadoop/ozone/s3/OzoneClientProducer.java | 5 +- .../hadoop/ozone/s3/OzoneServiceProvider.java | 78 -- .../hadoop/ozone/s3/TestOzoneClientProducer.java | 33 + .../ozone/genesis/BenchMarkOzoneManager.java | 193 ----- .../org/apache/hadoop/ozone/genesis/Genesis.java | 3 +- 103 files changed, 2765 insertions(+), 1987 deletions(-) diff --cc hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/ReplicationServer.java index 5af0b90,bf8d6f1..b1618d5 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/ReplicationServer.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/ReplicationServer.java @@@ -22,8 -22,8 +22,9 @@@ import java.util.concurrent.TimeUnit import org.apache.hadoop.hdds.conf.Config; import org.apache.hadoop.hdds.conf.ConfigGroup; - import org.apache.hadoop.hdds.conf.ConfigTag; + import org.apache.hadoop.hdds.conf.ConfigType; +import org.apache.hadoop.hdds.security.exception.SCMSecurityException; + import org.apache.hadoop.hdds.conf.PostConstruct; import org.apache.hadoop.hdds.security.x509.SecurityConfig; import org.apache.hadoop.hdds.security.x509.certificate.client.CertificateClient; import org.apache.hadoop.hdds.tracing.GrpcServerInterceptor; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
