hadoop-ozone-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sodonn...@apache.org
Subject [hadoop-ozone] 01/01: Merged master into branch
Date Fri, 22 Nov 2019 22:30:01 GMT
This is an automated email from the ASF dual-hosted git repository.

sodonnell pushed a commit to branch HDDS-1880-Decom
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git

commit 0c979038d5af35769ea0faf397f6db565134995c
Merge: 88147d0 6105e31
Author: S O'Donnell <sodonnell@cloudera.com>
AuthorDate: Fri Nov 22 18:30:56 2019 +0000

    Merged master into branch

 .../dev-support/checks/unit.sh => .asf.yaml        |  31 +-
 .../checks/unit.sh => .github/buildenv/Dockerfile  |  23 +-
 .../unit.sh => .github/buildenv/entrypoint.sh      |  21 +-
 .github/workflows/post-commit.yml                  | 120 +++++++
 .github/workflows/pr.yml                           | 114 ++++++
 CONTRIBUTION.md                                    |   5 +-
 README.md                                          |   2 +-
 .../apache/hadoop/hdds/scm/XceiverClientGrpc.java  |  51 ++-
 .../hadoop/hdds/scm/XceiverClientManager.java      |   2 +-
 .../apache/hadoop/hdds/scm/XceiverClientRatis.java |   3 +-
 .../hdds/scm/client/ContainerOperationClient.java  |  76 +---
 .../hadoop/hdds/scm/client/HddsClientUtils.java    |  42 +--
 .../hadoop/hdds/scm/storage/BlockOutputStream.java |  53 ++-
 .../apache/hadoop/hdds/scm/storage/BufferPool.java |  21 +-
 .../hadoop/hdds/scm/storage/CommitWatcher.java     |  21 +-
 .../java/org/apache/hadoop/hdds/HddsUtils.java     |   8 +-
 .../hadoop/hdds/cli/HddsVersionProvider.java       |   3 +-
 .../org/apache/hadoop/hdds/client/BlockID.java     |  12 +-
 .../hadoop/hdds/client/ContainerBlockID.java       |  13 +-
 .../apache/hadoop/hdds/conf/HddsConfServlet.java   |   2 +-
 .../hadoop/hdds/protocol/SCMSecurityProtocol.java  |   4 +-
 .../hdds/protocolPB/SCMSecurityProtocolPB.java     |   5 +-
 .../hdds/ratis/ContainerCommandRequestMessage.java |   3 +-
 .../org/apache/hadoop/hdds/ratis/RatisHelper.java  |  12 -
 .../java/org/apache/hadoop/hdds/scm/ScmConfig.java |  76 ++++
 .../org/apache/hadoop/hdds/scm/ScmConfigKeys.java  |  11 +-
 .../apache/hadoop/hdds/scm/XceiverClientReply.java |  18 +-
 .../apache/hadoop/hdds/scm/client/ScmClient.java   |   9 -
 .../org/apache/hadoop/hdds/scm/net/NetUtils.java   |  22 +-
 .../hadoop/hdds/scm/net/NetworkTopologyImpl.java   |  10 +-
 .../hadoop/hdds/scm/net/NodeSchemaLoader.java      |  27 +-
 .../apache/hadoop/hdds/scm/pipeline/Pipeline.java  |  55 ++-
 .../scm/protocol/ScmBlockLocationProtocol.java     |   5 +-
 .../protocol/StorageContainerLocationProtocol.java |  23 +-
 .../scm/protocolPB/ScmBlockLocationProtocolPB.java |   4 +-
 ...inerLocationProtocolClientSideTranslatorPB.java |  37 +-
 .../StorageContainerLocationProtocolPB.java        |   4 +-
 .../apache/hadoop/hdds/tracing/StringCodec.java    |  17 +-
 .../apache/hadoop/hdds/tracing/TraceAllMethod.java |   5 +
 .../apache/hadoop/hdds/tracing/TracingUtil.java    |  64 ++--
 .../org/apache/hadoop/hdds/utils/db/DBProfile.java |   2 +-
 .../apache/hadoop/hdds/utils/db/RDBMetrics.java    |  75 ++++
 .../org/apache/hadoop/hdds/utils/db/RDBStore.java  |  61 ++--
 .../org/apache/hadoop/hdds/utils/db/RDBTable.java  |  18 +-
 .../org/apache/hadoop/ozone/OzoneConfigKeys.java   |   4 +
 .../java/org/apache/hadoop/ozone/OzoneConsts.java  |   2 +
 .../org/apache/hadoop/ozone/audit/SCMAction.java   |   1 +
 .../org/apache/hadoop/ozone/common/Checksum.java   |  37 +-
 .../apache/hadoop/ozone/common/ChecksumData.java   |  28 +-
 .../apache/hadoop/ozone/common/ChunkBuffer.java    |  87 +++++
 .../common/ChunkBufferImplWithByteBuffer.java      | 108 ++++++
 .../ozone/container/common/helpers/BlockData.java  |  32 +-
 .../java/org/apache/hadoop/ozone/lease/Lease.java  |  46 ++-
 .../hadoop/ozone/lease/LeaseCallbackExecutor.java  |   5 +-
 .../apache/hadoop/ozone/lease/LeaseManager.java    |  20 +-
 .../apache/hadoop/ozone/lease/package-info.java    |   6 +-
 .../proto/StorageContainerLocationProtocol.proto   |  30 +-
 hadoop-hdds/common/src/main/proto/hdds.proto       |  12 +-
 .../common/src/main/resources/ozone-default.xml    |  47 +--
 .../ratis/TestContainerCommandRequestMessage.java  |   8 +-
 .../hadoop/hdds/scm/net/TestNodeSchemaLoader.java  | 151 ++++----
 .../certificates/TestCertificateSignRequest.java   |  33 ++
 .../hadoop/hdds/utils/db/TestRDBTableStore.java    |  53 ++-
 .../hdds/utils/db/TestTypedRDBTableStore.java      |   4 -
 .../hadoop/ozone/common/TestChunkBuffer.java       | 134 +++++++
 .../hadoop/ozone/lease/TestLeaseManager.java       |   7 +-
 .../apache/hadoop/ozone/lease/package-info.java    |   8 +-
 .../common/src/test/resources/log4j.properties     |  23 ++
 .../networkTopologyTestFiles/external-entity.xml   |  52 +++
 .../hadoop/hdds/conf/ConfigFileAppender.java       |  21 +-
 .../org/apache/hadoop/hdds/conf/ConfigTag.java     |   3 +-
 .../apache/hadoop/ozone/HddsDatanodeService.java   |  18 +-
 .../container/common/impl/ContainerDataYaml.java   |   5 +-
 .../container/common/impl/HddsDispatcher.java      |   5 +
 .../ozone/container/common/interfaces/Handler.java |  60 ++--
 .../common/report/PipelineReportPublisher.java     |   4 +-
 .../container/common/report/ReportPublisher.java   |   2 +-
 .../common/statemachine/DatanodeConfiguration.java |  91 +++++
 .../common/statemachine/DatanodeStateMachine.java  |  16 +-
 .../CloseContainerCommandHandler.java              |   3 +-
 .../commandhandler/CommandDispatcher.java          |   6 +
 .../commandhandler/CommandHandler.java             |   8 +
 .../DeleteContainerCommandHandler.java             |  70 +++-
 .../ReplicateContainerCommandHandler.java          |   4 +-
 .../transport/server/GrpcXceiverService.java       |   8 +-
 .../server/ratis/ContainerStateMachine.java        |  16 +-
 .../transport/server/ratis/XceiverServerRatis.java |  27 +-
 .../ozone/container/keyvalue/KeyValueHandler.java  |  12 +-
 .../container/keyvalue/TarContainerPacker.java     | 170 ++++-----
 .../container/keyvalue/helpers/ChunkUtils.java     |  55 +--
 .../keyvalue/impl/ChunkManagerDummyImpl.java       |  11 +-
 .../container/keyvalue/impl/ChunkManagerImpl.java  |   5 +-
 .../ozone/container/ozoneimpl/OzoneContainer.java  |  59 ++--
 .../replication/ContainerStreamingOutput.java      |   5 +-
 .../container/replication/GrpcOutputStream.java    | 129 +++++++
 .../replication/GrpcReplicationClient.java         |  24 +-
 .../replication/GrpcReplicationService.java        |  94 +----
 .../OnDemandContainerReplicationSource.java        |  13 +-
 .../replication/ReplicationSupervisor.java         |  61 +++-
 .../protocol/StorageContainerDatanodeProtocol.java |   5 +-
 .../StorageContainerDatanodeProtocolPB.java        |   4 +-
 .../proto/StorageContainerDatanodeProtocol.proto   |   1 +
 .../container/common/impl/TestHddsDispatcher.java  |  16 +-
 .../container/common/interfaces/TestHandler.java   |   8 +-
 .../container/keyvalue/TestKeyValueHandler.java    |  10 +-
 .../TestKeyValueHandlerWithUnhealthyContainer.java |   7 +-
 .../container/keyvalue/helpers/TestChunkUtils.java |  19 +
 .../replication/TestGrpcOutputStream.java          | 213 ++++++++++++
 .../replication/TestReplicationSupervisor.java     | 218 +++++++++---
 hadoop-hdds/framework/pom.xml                      |  13 +-
 .../hadoop/hdds/server/PrometheusServlet.java      |  13 +-
 .../hadoop/hdds/server/RatisDropwizardExports.java |  31 +-
 .../hdds/server/RatisNameRewriteSampleBuilder.java | 104 ++++++
 .../hadoop/hdds/server/events/EventExecutor.java   |   2 +-
 .../hadoop/hdds/server/events/EventHandler.java    |   4 +-
 .../hadoop/hdds/server/events/EventPublisher.java  |   2 +-
 .../hadoop/hdds/server/events/EventQueue.java      |  13 +-
 .../hadoop/hdds/server/events/EventWatcher.java    |  46 +--
 .../hdds/server/events/EventWatcherMetrics.java    |  11 +-
 .../hdds/server/events/SingleThreadExecutor.java   |  36 +-
 .../hadoop/hdds/server/events/TypedEvent.java      |   4 +-
 .../hadoop/hdds/server/events/package-info.java    |   7 +-
 .../hdds/server/TestRatisDropwizardExports.java    |  66 ++++
 .../hadoop/hdds/server/TestRatisNameRewrite.java   | 107 ++++++
 .../hdds/server/events/EventHandlerStub.java       |   4 +-
 hadoop-hdds/pom.xml                                |   3 +-
 .../hdds/scm/container/ReplicationManager.java     |   4 +-
 .../hdds/scm/pipeline/PipelineReportHandler.java   |  50 +--
 .../hdds/scm/pipeline/PipelineStateManager.java    |   8 +-
 .../hdds/scm/pipeline/RatisPipelineProvider.java   |  13 +-
 ...inerLocationProtocolServerSideTranslatorPB.java |  35 +-
 .../scm/safemode/HealthyPipelineSafeModeRule.java  |  75 ++--
 .../hadoop/hdds/scm/safemode/SafeModeHandler.java  |   5 +-
 .../hdds/scm/server/SCMClientProtocolServer.java   |  49 ++-
 .../hdds/scm/server/SCMHTTPServerConfig.java       |  82 +++++
 .../hdds/scm/server/SCMSecurityProtocolServer.java |   3 +-
 .../hdds/scm/server/StorageContainerManager.java   |  88 +++--
 .../server/StorageContainerManagerHttpServer.java  |   6 +-
 .../scm/server/StorageContainerManagerStarter.java |   5 +-
 .../java/org/apache/hadoop/hdds/scm/TestUtils.java |  14 +-
 .../hadoop/hdds/scm/node/TestDeadNodeHandler.java  |   2 +
 .../scm/pipeline/MockRatisPipelineProvider.java    |  15 +
 .../safemode/TestHealthyPipelineSafeModeRule.java  |   3 +-
 .../TestOneReplicaPipelineSafeModeRule.java        |   3 +-
 .../hdds/scm/safemode/TestSCMSafeModeManager.java  |   6 +-
 .../ozone/container/replication/package-info.java  |  18 -
 .../ozone/client/protocol/ClientProtocol.java      |  20 ++
 .../apache/hadoop/ozone/client/rpc/RpcClient.java  |  50 ++-
 .../main/java/org/apache/hadoop/ozone/OmUtils.java |  24 +-
 .../org/apache/hadoop/ozone/om/OMConfigKeys.java   |   3 +
 .../apache/hadoop/ozone/om/OMMetadataManager.java  |  18 +
 .../hadoop/ozone/om/exceptions/OMException.java    |  12 +-
 .../apache/hadoop/ozone/om/helpers/OmKeyInfo.java  |  11 +
 .../om/helpers/OmMultipartUploadCompleteList.java  |   8 +-
 .../ozone/om/protocol/OzoneManagerProtocol.java    |  19 +
 ...OzoneManagerProtocolClientSideTranslatorPB.java |  42 +++
 .../src/main/proto/OzoneManagerProtocol.proto      |  26 ++
 hadoop-ozone/dev-support/checks/integration.sh     |   3 +-
 hadoop-ozone/dev-support/checks/shellcheck.sh      |   1 -
 .../dev-support/checks/{unit.sh => sonar.sh}       |  18 +-
 hadoop-ozone/dev-support/checks/unit.sh            |   2 +-
 .../dist/dev-support/bin/dist-layout-stitching     |   4 +-
 hadoop-ozone/dist/pom.xml                          |   2 +-
 .../dist/src/main/compose/ozone-om-ha/Dockerfile   |   4 +-
 .../main/compose/ozone-om-ha/docker-compose.yaml   |  30 +-
 .../main/compose/ozone-om-ha/{test.sh => run.sh}   |   0
 .../src/main/compose/ozoneperf/docker-compose.yaml |   4 +
 .../dist/src/main/compose/ozonescripts/Dockerfile  |   6 +-
 .../dist/src/main/compose/ozonescripts/README.md   |   6 +-
 .../main/compose/ozonescripts/docker-compose.yaml  |  18 +-
 hadoop-ozone/dist/src/main/docker/Dockerfile       |   2 +
 .../{dockerbin => dockerlibexec}/entrypoint.sh     |   0
 .../main/{dockerbin => dockerlibexec}/envtoconf.py |   0
 .../{dockerbin => dockerlibexec}/transformation.py |   0
 .../src/main/smoketest/basic/ozone-shell.robot     |   6 +-
 .../dist/src/main/smoketest/ozonefs/ozonefs.robot  |  14 +-
 .../src/main/smoketest/s3/MultipartUpload.robot    |  31 +-
 .../dist/src/main/smoketest/s3/bucketcreate.robot  |   4 +
 .../apache/hadoop/ozone/insight/LogSubcommand.java |   2 +-
 .../ozone/insight/datanode/RatisInsight.java       |  32 +-
 .../hdds/scm/pipeline/TestSCMPipelineManager.java  | 151 ++++----
 .../apache/hadoop/ozone/MiniOzoneClusterImpl.java  |  58 +++-
 .../hadoop/ozone/MiniOzoneHAClusterImpl.java       |   6 +-
 .../hadoop/ozone/TestSecureOzoneCluster.java       | 385 +++++++++------------
 .../hadoop/ozone/client/rpc/TestCommitWatcher.java |  19 +-
 .../client/rpc/TestOzoneAtRestEncryption.java      |  82 +++++
 .../client/rpc/TestOzoneRpcClientAbstract.java     |  11 +-
 .../ozone/container/TestContainerReplication.java  |   2 +-
 .../container/common/helpers/TestBlockData.java    |  12 +
 .../container/metrics/TestContainerMetrics.java    |   9 +-
 .../container/server/TestContainerServer.java      |   7 +-
 .../server/TestSecureContainerServer.java          |   7 +-
 .../apache/hadoop/ozone/om/TestKeyManagerImpl.java | 133 ++++++-
 .../ozone/scm/pipeline/TestSCMPipelineMetrics.java |   3 +
 .../org/apache/hadoop/ozone/om/KeyManager.java     |  19 +
 .../org/apache/hadoop/ozone/om/KeyManagerImpl.java | 206 ++++-------
 .../hadoop/ozone/om/OmMetadataManagerImpl.java     |   9 +
 .../org/apache/hadoop/ozone/om/OzoneManager.java   |  45 +++
 .../hadoop/ozone/om/OzoneManagerStarter.java       |   3 +-
 .../apache/hadoop/ozone/om/ha/OMHANodeDetails.java |  21 +-
 .../S3MultipartUploadCommitPartRequest.java        |  23 +-
 .../S3MultipartUploadCompleteRequest.java          | 241 +++++++------
 .../S3MultipartUploadCompleteResponse.java         |  29 +-
 ...OzoneManagerProtocolServerSideTranslatorPB.java |   2 +-
 .../protocolPB/OzoneManagerRequestHandler.java     |  36 +-
 .../hadoop/ozone/web/ozShell/OzoneShell.java       |   2 +-
 .../web/ozShell/bucket/AddAclBucketHandler.java    |  44 +--
 .../web/ozShell/bucket/CreateBucketHandler.java    |  64 ++--
 .../web/ozShell/bucket/DeleteBucketHandler.java    |  20 +-
 .../web/ozShell/bucket/GetAclBucketHandler.java    |  37 +-
 .../web/ozShell/bucket/InfoBucketHandler.java      |  22 +-
 .../web/ozShell/bucket/ListBucketHandler.java      |  44 +--
 .../web/ozShell/bucket/RemoveAclBucketHandler.java |  43 +--
 .../ozone/web/ozShell/bucket/S3BucketMapping.java  |  26 +-
 .../web/ozShell/bucket/SetAclBucketHandler.java    |  35 +-
 .../ozone/web/ozShell/keys/AddAclKeyHandler.java   |  59 ++--
 .../ozone/web/ozShell/keys/DeleteKeyHandler.java   |  25 +-
 .../ozone/web/ozShell/keys/GetAclKeyHandler.java   |  44 +--
 .../ozone/web/ozShell/keys/GetKeyHandler.java      |  80 +++--
 .../ozone/web/ozShell/keys/InfoKeyHandler.java     |  39 ++-
 .../ozone/web/ozShell/keys/ListKeyHandler.java     |  76 ++--
 .../ozone/web/ozShell/keys/PutKeyHandler.java      |  92 ++---
 .../web/ozShell/keys/RemoveAclKeyHandler.java      |  59 ++--
 .../ozone/web/ozShell/keys/RenameKeyHandler.java   |  26 +-
 .../ozone/web/ozShell/keys/SetAclKeyHandler.java   |  39 ++-
 .../ozone/web/ozShell/s3/GetS3SecretHandler.java   |  25 +-
 .../hadoop/ozone/web/ozShell/s3/S3Shell.java       |   5 +-
 .../web/ozShell/token/CancelTokenHandler.java      |  34 +-
 .../ozone/web/ozShell/token/GetTokenHandler.java   |  38 +-
 .../ozone/web/ozShell/token/RenewTokenHandler.java |  38 +-
 .../web/ozShell/volume/AddAclVolumeHandler.java    |  37 +-
 .../web/ozShell/volume/CreateVolumeHandler.java    |  55 +--
 .../web/ozShell/volume/DeleteVolumeHandler.java    |  15 +-
 .../web/ozShell/volume/GetAclVolumeHandler.java    |  30 +-
 .../web/ozShell/volume/InfoVolumeHandler.java      |  11 +-
 .../web/ozShell/volume/ListVolumeHandler.java      |  62 ++--
 .../web/ozShell/volume/RemoveAclVolumeHandler.java |  37 +-
 .../web/ozShell/volume/SetAclVolumeHandler.java    |  43 +--
 .../web/ozShell/volume/UpdateVolumeHandler.java    |  22 +-
 ...TestOzoneManagerDoubleBufferWithOMResponse.java |  13 +-
 hadoop-ozone/ozonefs-lib-current/pom.xml           |  15 +
 hadoop-ozone/pom.xml                               |   3 +-
 .../org/apache/hadoop/ozone/recon/ReconServer.java |   3 +
 .../org/apache/hadoop/ozone/recon/ReconUtils.java  |  22 +-
 .../ozone/recon/api/ContainerKeyService.java       |  22 +-
 .../hadoop/ozone/recon/api/types/KeyMetadata.java  |   6 +-
 .../recon/spi/OzoneManagerServiceProvider.java     |   2 +-
 .../spi/impl/OzoneManagerServiceProviderImpl.java  |  30 +-
 .../hadoop/ozone/s3/endpoint/BucketEndpoint.java   |  20 +-
 .../endpoint/MultiDeleteRequestUnmarshaller.java   |   8 +-
 .../hadoop/ozone/s3/endpoint/ObjectEndpoint.java   | 244 +++++++------
 .../hadoop/ozone/s3/exception/S3ErrorTable.java    |   4 +
 .../ozone/s3/util/RangeHeaderParserUtil.java       |   4 +-
 .../hadoop/ozone/client/OzoneBucketStub.java       |  26 +-
 .../hadoop/ozone/client/OzoneOutputStreamStub.java |   8 +-
 .../s3/endpoint/TestMultipartUploadComplete.java   |   8 +-
 .../ozone/s3/util/TestRangeHeaderParserUtil.java   |   6 +-
 .../ozone/audit/parser/common/DatabaseHelper.java  | 157 ++++-----
 .../audit/parser/handler/LoadCommandHandler.java   |  11 +-
 .../audit/parser/handler/QueryCommandHandler.java  |  11 +-
 .../parser/handler/TemplateCommandHandler.java     |  11 +-
 .../hadoop/ozone/freon/BaseFreonGenerator.java     |  10 +-
 .../hadoop/ozone/freon/ContentGenerator.java       |   6 +-
 .../java/org/apache/hadoop/ozone/freon/Freon.java  |   9 +-
 .../ozone/freon/OzoneClientKeyGenerator.java       |  15 +-
 .../ozone/freon/OzoneClientKeyValidator.java       |  93 ++++-
 .../org/apache/hadoop/ozone/freon/ProgressBar.java |  33 +-
 .../hadoop/ozone/freon/RandomKeyGenerator.java     |   4 +-
 .../apache/hadoop/ozone/freon/SameKeyReader.java   |  65 +---
 .../ozone/genesis/BenchMarkDatanodeDispatcher.java |  82 +++--
 .../ozone/genesis/BenchmarkBlockDataToString.java  | 166 +++++++++
 .../org/apache/hadoop/ozone/genesis/Genesis.java   |   5 +-
 .../apache/hadoop/ozone/freon/TestProgressBar.java |  24 +-
 pom.xml                                            |  21 +-
 274 files changed, 5840 insertions(+), 3180 deletions(-)

diff --cc hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocol.java
index 8b37c57,365750a..2addbc4
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocol.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocol.java
@@@ -105,36 -104,20 +104,30 @@@ public interface StorageContainerLocati
    void deleteContainer(long containerID) throws IOException;
  
    /**
 -   *  Queries a list of Node Statuses.
 -   * @param state
 +   *  Queries a list of Node Statuses. Passing a null for either opState or
 +   *  state acts like a wildcard returning all nodes in that state.
 +   * @param opState The node operational state
 +   * @param state The node health
     * @return List of Datanodes.
     */
 -  List<HddsProtos.Node> queryNode(HddsProtos.NodeState state,
 -      HddsProtos.QueryScope queryScope, String poolName) throws IOException;
 +  List<HddsProtos.Node> queryNode(HddsProtos.NodeOperationalState opState,
 +      HddsProtos.NodeState state, HddsProtos.QueryScope queryScope,
 +      String poolName) throws IOException;
 +
 +  void decommissionNodes(List<String> nodes) throws IOException;
 +
 +  void recommissionNodes(List<String> nodes) throws IOException;
 +
 +  void startMaintenanceNodes(List<String> nodes, int endInHours)
 +      throws IOException;
  
    /**
-    * Notify from client when begin or finish creating objects like pipeline
-    * or containers on datanodes.
-    * Container will be in Operational state after that.
-    * @param type object type
-    * @param id object id
-    * @param op operation type (e.g., create, close, delete)
-    * @param stage creation stage
+    * Close a container.
+    *
+    * @param containerID ID of the container to close
+    * @throws IOException in case of any Exception
     */
-   void notifyObjectStageChange(
-       ObjectStageChangeRequestProto.Type type, long id,
-       ObjectStageChangeRequestProto.Op op,
-       ObjectStageChangeRequestProto.Stage stage) throws IOException;
+   void closeContainer(long containerID) throws IOException;
  
    /**
     * Creates a replication pipeline of a specified type.
diff --cc hadoop-hdds/common/src/main/resources/ozone-default.xml
index 1c32380,8110242..2e6e2c4
--- a/hadoop-hdds/common/src/main/resources/ozone-default.xml
+++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml
@@@ -2483,14 -2466,11 +2466,22 @@@
      </description>
    </property>
    <property>
 +    <name>ozone.scm.datanode.admin.monitor.interval</name>
 +    <value>30s</value>
 +    <tag>SCM</tag>
 +    <description>
 +      This sets how frequently the datanode admin monitor runs to check for
 +      nodes added to the admin workflow or removed from it. The progress
 +      of decommissioning and entering maintenance nodes is also checked to see
 +      if they have completed.
 +    </description>
 +  </property>
++  <property>
+     <name>ozone.client.list.trash.keys.max</name>
+     <value>1000</value>
+     <tag>OZONE, CLIENT</tag>
+     <description>
+       The maximum number of keys to return for a list trash request.
+     </description>
+   </property>
  </configuration>
diff --cc hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocolServerSideTranslatorPB.java
index 47e2c92,f48fad1..37da3c5
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocolServerSideTranslatorPB.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocolServerSideTranslatorPB.java
@@@ -334,14 -308,14 +348,13 @@@ public final class StorageContainerLoca
      return NodeQueryResponseProto.newBuilder()
          .addAllDatanodes(datanodes)
          .build();
 -
    }
  
-   public ObjectStageChangeResponseProto notifyObjectStageChange(
-       ObjectStageChangeRequestProto request)
+   public SCMCloseContainerResponseProto closeContainer(
+       SCMCloseContainerRequestProto request)
        throws IOException {
-     impl.notifyObjectStageChange(request.getType(), request.getId(),
-         request.getOp(), request.getStage());
-     return ObjectStageChangeResponseProto.newBuilder().build();
+     impl.closeContainer(request.getContainerID());
+     return SCMCloseContainerResponseProto.newBuilder().build();
    }
  
    public ListPipelineResponseProto listPipelines(
diff --cc hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
index d558162,80a6a07..f1a6b22
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
@@@ -34,7 -35,7 +34,8 @@@ import org.apache.hadoop.hdds.protocol.
  import org.apache.hadoop.hdds.scm.HddsServerUtil;
  import org.apache.hadoop.hdds.scm.ScmInfo;
  import org.apache.hadoop.hdds.scm.ScmUtils;
 +import org.apache.hadoop.hdds.scm.node.NodeStatus;
+ import org.apache.hadoop.hdds.scm.events.SCMEvents;
  import org.apache.hadoop.hdds.scm.pipeline.PipelineNotFoundException;
  import org.apache.hadoop.hdds.scm.safemode.SafeModePrecheck;
  import org.apache.hadoop.hdds.scm.container.ContainerID;


---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org


Mime
View raw message