You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by el...@apache.org on 2019/10/13 06:50:57 UTC
[hadoop-ozone] 05/18: Merge remote-tracking branch 'upstream/trunk'
into HDDS-2181
This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch HDDS-2181
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit 4fad1bd6d73b7ca18b28bf588aa9d278e6ef3021
Merge: cfabf1a 5249f99
Author: Vivek Ratnavel Subramanian <vi...@gmail.com>
AuthorDate: Thu Oct 3 14:56:32 2019 -0700
Merge remote-tracking branch 'upstream/trunk' into HDDS-2181
.../SCMSecurityProtocolClientSideTranslatorPB.java | 104 +++--
.../SCMSecurityProtocolServerSideTranslatorPB.java | 132 ------
.../org/apache/hadoop/hdds/scm/ScmConfigKeys.java | 5 +
...inerLocationProtocolClientSideTranslatorPB.java | 411 +++++++++---------
.../apache/hadoop/hdds/utils/db/TypedTable.java | 2 +-
.../hadoop/hdds/utils/db/cache/TableCache.java | 9 +
.../hadoop/hdds/utils/db/cache/TableCacheImpl.java | 7 +
.../org/apache/hadoop/ozone/OzoneConfigKeys.java | 5 +
.../src/main/proto/SCMSecurityProtocol.proto | 96 +++--
.../src/main/proto/ScmBlockLocationProtocol.proto | 2 +-
.../proto/StorageContainerLocationProtocol.proto | 185 ++++----
.../common/src/main/resources/ozone-default.xml | 8 +
.../server/ratis/ContainerStateMachine.java | 20 +-
.../transport/server/ratis/XceiverServerRatis.java | 8 +-
.../replication/GrpcReplicationClient.java | 6 +
...inerDatanodeProtocolClientSideTranslatorPB.java | 60 +--
...inerDatanodeProtocolServerSideTranslatorPB.java | 115 ++---
.../proto/StorageContainerDatanodeProtocol.proto | 58 ++-
.../ozone/container/common/SCMTestUtils.java | 4 +-
.../hadoop/hdds/server/PrometheusMetricsSink.java | 16 +-
.../hdds/server/TestPrometheusMetricsSink.java | 77 +++-
hadoop-hdds/pom.xml | 2 +-
.../container/AbstractContainerReportHandler.java | 8 +
.../hdds/scm/container/ContainerManager.java | 8 +
.../hdds/scm/container/ContainerReportHandler.java | 2 +
.../IncrementalContainerReportHandler.java | 10 +
.../hdds/scm/container/SCMContainerManager.java | 17 +
.../metrics/SCMContainerManagerMetrics.java | 54 +++
.../SCMSecurityProtocolServerSideTranslatorPB.java | 186 ++++++++
...inerLocationProtocolServerSideTranslatorPB.java | 476 +++++++++++----------
.../hdds/scm/server/SCMClientProtocolServer.java | 12 +-
.../hdds/scm/server/SCMDatanodeProtocolServer.java | 102 ++---
.../hdds/scm/server/SCMSecurityProtocolServer.java | 27 +-
.../org/apache/hadoop/hdds/scm/cli/SCMCLI.java | 22 +-
.../hdds/scm/cli/container/CloseSubcommand.java | 7 +-
...CloseSubcommand.java => ContainerCommands.java} | 37 +-
.../hdds/scm/cli/container/CreateSubcommand.java | 5 +-
.../hdds/scm/cli/container/DeleteSubcommand.java | 7 +-
.../hdds/scm/cli/container/InfoSubcommand.java | 5 +-
.../hdds/scm/cli/container/ListSubcommand.java | 5 +-
.../cli/pipeline/ActivatePipelineSubcommand.java | 11 +-
.../scm/cli/pipeline/ClosePipelineSubcommand.java | 11 +-
.../cli/pipeline/DeactivatePipelineSubcommand.java | 11 +-
.../scm/cli/pipeline/ListPipelinesSubcommand.java | 11 +-
.../PipelineCommands.java} | 38 +-
.../apache/hadoop/ozone/client/rpc/RpcClient.java | 3 +-
.../main/java/org/apache/hadoop/ozone/OmUtils.java | 19 +-
.../apache/hadoop/ozone/om/OMMetadataManager.java | 4 +-
...lumeListCodec.java => UserVolumeInfoCodec.java} | 13 +-
.../hadoop/ozone/security/GDPRSymmetricKey.java | 8 +-
.../OzoneDelegationTokenSecretManager.java | 5 +-
.../hadoop/ozone/security/OzoneSecretManager.java | 7 +-
.../src/main/proto/OzoneManagerProtocol.proto | 2 +-
.../ozone/security/TestGDPRSymmetricKey.java | 4 +-
hadoop-ozone/dev-support/checks/checkstyle.sh | 2 +-
.../src/main/compose/ozonesecure-mr/docker-config | 3 +-
hadoop-ozone/dist/src/main/compose/test-all.sh | 4 +-
hadoop-ozone/dist/src/main/compose/test-single.sh | 2 +
hadoop-ozone/dist/src/main/compose/testlib.sh | 12 +-
.../ozone/insight/BaseInsightSubCommand.java | 7 +-
.../scm/ScmProtocolBlockLocationInsight.java | 4 +-
...va => ScmProtocolContainerLocationInsight.java} | 18 +-
...nsight.java => ScmProtocolDatanodeInsight.java} | 27 +-
...nsight.java => ScmProtocolSecurityInsight.java} | 18 +-
.../metrics/TestSCMContainerManagerMetrics.java | 63 ++-
.../rpc/TestContainerStateMachineFailures.java | 65 +++
.../ozone/om/TestOzoneManagerConfiguration.java | 9 +-
.../hadoop/ozone/om/OmMetadataManagerImpl.java | 25 +-
.../org/apache/hadoop/ozone/om/OzoneManager.java | 232 ++--------
.../apache/hadoop/ozone/om/VolumeManagerImpl.java | 35 +-
.../apache/hadoop/ozone/om/ha/OMHANodeDetails.java | 306 +++++++++++++
.../hadoop/ozone/om/{ => ha}/OMNodeDetails.java | 2 +-
.../apache/hadoop/ozone/om/ha/package-info.java} | 23 +-
.../ozone/om/ratis/OzoneManagerRatisServer.java | 2 +-
.../request/s3/bucket/S3BucketCreateRequest.java | 5 +-
.../om/request/volume/OMVolumeCreateRequest.java | 5 +-
.../om/request/volume/OMVolumeDeleteRequest.java | 2 +-
.../ozone/om/request/volume/OMVolumeRequest.java | 14 +-
.../om/request/volume/OMVolumeSetOwnerRequest.java | 4 +-
.../om/response/volume/OMVolumeCreateResponse.java | 11 +-
.../om/response/volume/OMVolumeDeleteResponse.java | 8 +-
.../response/volume/OMVolumeSetOwnerResponse.java | 8 +-
.../om/snapshot/OzoneManagerSnapshotProvider.java | 2 +-
.../om/ratis/TestOzoneManagerRatisServer.java | 2 +-
.../ozone/om/request/TestOMRequestUtils.java | 6 +-
.../hadoop/ozone/om/request/package-info.java} | 18 +-
.../request/volume/TestOMVolumeCreateRequest.java | 6 +-
.../volume/TestOMVolumeSetOwnerRequest.java | 4 +-
.../ozone/om/response/TestOMResponseUtils.java | 6 +-
.../hadoop/ozone/om/response/package-info.java} | 18 +-
.../volume/TestOMVolumeCreateResponse.java | 6 +-
.../volume/TestOMVolumeDeleteResponse.java | 8 +-
.../volume/TestOMVolumeSetOwnerResponse.java | 10 +-
.../ozone/om/response/volume/package-info.java} | 29 +-
.../TestOzoneDelegationTokenSecretManager.java | 29 +-
hadoop-ozone/pom.xml | 6 +-
.../hadoop/ozone/s3/OzoneClientProducer.java | 11 +-
.../hadoop/ozone/s3/OzoneServiceProvider.java | 50 ++-
.../apache/hadoop/ozone/s3/util/OzoneS3Util.java | 44 ++
.../hadoop/ozone/s3/util/TestOzoneS3Util.java | 130 ++++++
.../org/apache/hadoop/ozone/scm/cli/SQLCLI.java | 4 +-
.../services/org.apache.hadoop.fs.FileSystem | 16 +
102 files changed, 2326 insertions(+), 1464 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: hdfs-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: hdfs-commits-help@hadoop.apache.org