You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by el...@apache.org on 2021/02/24 08:45:59 UTC
[ozone] 10/27: Merge remote-tracking branch 'origin/master' into dev
This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch HDDS-3816-ec
in repository https://gitbox.apache.org/repos/asf/ozone.git
commit aa2f05485fecbfbec01661e189f60dc590abfc4b
Merge: 834fb0a 5eb624a
Author: Elek Márton <el...@apache.org>
AuthorDate: Wed Jan 27 11:16:44 2021 +0100
Merge remote-tracking branch 'origin/master' into dev
.github/workflows/post-commit.yml | 9 +-
.../apache/hadoop/hdds/scm/XceiverClientGrpc.java | 8 +-
.../hadoop/hdds/scm/XceiverClientMetrics.java | 4 +-
.../apache/hadoop/hdds/scm/XceiverClientRatis.java | 4 +-
hadoop-hdds/common/src/main/conf/hadoop-env.cmd | 90 --
hadoop-hdds/common/src/main/conf/hadoop-env.sh | 451 -------
hadoop-hdds/common/src/main/conf/ozone-env.sh | 279 ++++
.../org/apache/hadoop/hdds/client/OzoneQuota.java | 6 +-
.../common/src/main/resources/ozone-default.xml | 10 +-
.../container/common/helpers/ContainerMetrics.java | 6 +-
.../container/common/impl/HddsDispatcher.java | 5 +-
.../common/transport/server/ratis/CSMMetrics.java | 7 +-
.../server/ratis/ContainerStateMachine.java | 2 +-
.../metadata/DatanodeSchemaTwoDBDefinition.java | 6 +-
.../hdds/security/token/BlockTokenVerifier.java | 13 +
.../x509/certificate/client/CertificateClient.java | 12 +
.../client/DefaultCertificateClient.java | 30 +-
.../server/OzoneProtocolMessageDispatcher.java | 5 +-
.../hadoop/hdds/utils/db/DBConfigFromFile.java | 12 +-
.../interface-client/src/main/proto/hdds.proto | 10 +-
.../hadoop/hdds/scm/block/BlockManagerImpl.java | 3 +-
.../hadoop/hdds/scm/block/DeletedBlockLogImpl.java | 102 +-
.../hadoop/hdds/scm/metadata/SCMMetadataStore.java | 14 -
.../hdds/scm/metadata/SCMMetadataStoreImpl.java | 30 -
.../hdds/scm/pipeline/PipelinePlacementPolicy.java | 12 +-
.../scm/TestStorageContainerManagerHttpServer.java | 2 +
.../hadoop/hdds/scm/block/TestDeletedBlockLog.java | 11 +-
...TestSCMStoreImplWithOldPipelineIDKeyFormat.java | 10 -
.../org/apache/hadoop/ozone/om/OMConfigKeys.java | 9 +-
.../hadoop/ozone/security/acl/RequestContext.java | 48 +-
hadoop-ozone/dev-support/checks/hadolint.sh | 28 +-
.../dist/dev-support/bin/dist-layout-stitching | 14 +-
.../compose/{ozone-topology => compatibility}/.env | 1 -
.../{ozone => compatibility}/docker-compose.yaml | 5 -
.../compose/{ozone => compatibility}/docker-config | 10 +-
.../main/compose/{ozone => compatibility}/test.sh | 34 +-
hadoop-ozone/dist/src/main/compose/ozone-csi/.env | 2 +-
.../src/main/compose/ozone-csi/docker-compose.yaml | 8 +-
.../dist/src/main/compose/ozone-csi/docker-config | 3 +
hadoop-ozone/dist/src/main/compose/ozone-ha/.env | 2 +-
.../dist/src/main/compose/ozone-ha/docker-config | 3 +
.../dist/src/main/compose/ozone-mr/common-config | 3 +
.../compose/ozone-mr/hadoop27/docker-compose.yaml | 5 +-
.../main/compose/ozone-mr/hadoop27/docker-config | 3 +
.../dist/src/main/compose/ozone-mr/hadoop31/.env | 2 +-
.../compose/ozone-mr/hadoop31/docker-compose.yaml | 13 +-
.../main/compose/ozone-mr/hadoop31/docker-config | 3 +
.../dist/src/main/compose/ozone-mr/hadoop32/.env | 4 +-
.../compose/ozone-mr/hadoop32/docker-compose.yaml | 11 +-
.../main/compose/ozone-mr/hadoop32/docker-config | 3 +
.../dist/src/main/compose/ozone-om-ha-s3/.env | 2 +-
.../compose/ozone-om-ha-s3/docker-compose.yaml | 12 +-
.../src/main/compose/ozone-om-ha-s3/docker-config | 3 +
.../src/main/compose/ozone-om-ha/docker-config | 3 +
.../dist/src/main/compose/ozone-topology/.env | 2 +-
.../compose/ozone-topology/docker-compose.yaml | 16 +-
.../src/main/compose/ozone-topology/docker-config | 3 +
hadoop-ozone/dist/src/main/compose/ozone/.env | 2 +-
.../src/main/compose/ozone/docker-compose.yaml | 10 +-
.../dist/src/main/compose/ozone/docker-config | 3 +
hadoop-ozone/dist/src/main/compose/ozone/test.sh | 2 +
.../src/main/compose/ozoneblockade/docker-config | 3 +
.../src/main/compose/ozones3-haproxy/docker-config | 3 +
.../src/main/compose/ozonescripts/docker-config | 3 +
.../dist/src/main/compose/ozonesecure-mr/.env | 4 +-
.../compose/ozonesecure-mr/docker-compose.yaml | 16 +-
.../src/main/compose/ozonesecure-mr/docker-config | 5 +
.../dist/src/main/compose/ozonesecure-om-ha/.env | 2 +-
.../compose/ozonesecure-om-ha/docker-compose.yaml | 20 +-
.../main/compose/ozonesecure-om-ha/docker-config | 3 +
.../dist/src/main/compose/ozonesecure/.env | 2 +-
.../main/compose/ozonesecure/docker-compose.yaml | 28 +-
.../src/main/compose/ozonesecure/docker-config | 3 +
hadoop-ozone/dist/src/main/compose/test-all.sh | 2 +-
.../src/main/compose/upgrade/docker-compose.yaml | 7 +
.../dist/src/main/compose/upgrade/docker-config | 3 +
.../dist/src/main/smoketest/cli/classpath.robot | 46 +
.../dist/src/main/smoketest/cli/envvars.robot | 77 ++
.../smoketest/compatibility/dn.robot} | 23 +-
.../smoketest/compatibility/om.robot} | 23 +-
.../smoketest/compatibility/recon.robot} | 15 +-
.../smoketest/compatibility/scm.robot} | 23 +-
hadoop-ozone/dist/src/main/smoketest/lib/os.robot | 4 +
.../dist/src/main/smoketest/ozone-lib/shell.robot | 4 +
hadoop-ozone/dist/src/shell/hdds/hadoop-config.cmd | 317 -----
hadoop-ozone/dist/src/shell/hdds/hadoop-config.sh | 165 ---
hadoop-ozone/dist/src/shell/hdds/workers.sh | 47 +-
hadoop-ozone/dist/src/shell/ozone/ozone | 245 ++--
hadoop-ozone/dist/src/shell/ozone/ozone-config.sh | 100 +-
.../ozone-functions.sh} | 1397 ++++++++++----------
hadoop-ozone/dist/src/shell/ozone/start-ozone.sh | 84 +-
hadoop-ozone/dist/src/shell/ozone/stop-ozone.sh | 60 +-
.../shell/shellprofile.d/hadoop-ozone-manager.sh | 8 +-
.../dist/src/shell/shellprofile.d/hadoop-ozone.sh | 6 +-
hadoop-ozone/dist/src/test/shell/gc_opts.bats | 40 +-
.../shell/ozone-functions_test_helper.bash} | 29 +-
.../shell/ozone_set_var_for_compatibility.bats | 86 ++
.../hadoop/fs/ozone/TestOzoneFileSystem.java | 4 +-
.../hadoop/fs/ozone/TestRootedOzoneFileSystem.java | 4 +-
.../org/apache/hadoop/ozone/MiniOzoneCluster.java | 1 +
.../apache/hadoop/ozone/MiniOzoneClusterImpl.java | 2 +
.../hadoop/ozone/MiniOzoneHAClusterImpl.java | 19 +-
.../hadoop/ozone/TestOzoneConfigurationFields.java | 2 +
.../ozone/client/CertificateClientTestImpl.java | 11 +
.../client/rpc/TestOzoneRpcClientAbstract.java | 12 +-
.../ozone/om/TestOzoneManagerConfiguration.java | 7 +-
.../hadoop/ozone/shell/TestOzoneShellHA.java | 10 +
.../hadoop/ozone/om/TrashOzoneFileSystem.java | 124 +-
.../apache/hadoop/ozone/om/TrashPolicyOzone.java | 2 +-
.../ozone/om/ratis/OzoneManagerDoubleBuffer.java | 4 +-
.../ozone/om/ratis/OzoneManagerRatisServer.java | 19 +-
.../OzoneDelegationTokenSecretManager.java | 24 +-
.../ozone/om/TestOzoneManagerHttpServer.java | 2 +
.../om/ratis/TestOzoneManagerRatisServer.java | 12 +-
.../security/TestOzoneBlockTokenSecretManager.java | 159 ++-
.../ozone/security/acl/TestRequestContext.java | 94 ++
.../spi/impl/OzoneManagerServiceProviderImpl.java | 4 +-
.../apache/hadoop/ozone/debug/ChunkKeyHandler.java | 4 -
.../apache/hadoop/ozone/genesis/BenchMarkSCM.java | 2 +-
pom.xml | 4 +-
120 files changed, 2340 insertions(+), 2514 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org