You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by so...@apache.org on 2020/12/03 13:58:06 UTC
[ozone] 02/02: Merge branch 'HDDS-1880-Decom'
This is an automated email from the ASF dual-hosted git repository.
sodonnell pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 3280f3c2cd7b7a5402e78f76851cd72953d4c3e5
Merge: 7b6eafd 43f03eb
Author: S O'Donnell <so...@cloudera.com>
AuthorDate: Thu Dec 3 13:51:31 2020 +0000
Merge branch 'HDDS-1880-Decom'
.../hadoop/hdds/protocol/DatanodeDetails.java | 101 ++-
.../org/apache/hadoop/hdds/scm/ScmConfigKeys.java | 5 +
.../apache/hadoop/hdds/scm/client/ScmClient.java | 45 +-
.../protocol/StorageContainerLocationProtocol.java | 18 +-
.../common/src/main/resources/ozone-default.xml | 11 +
.../hadoop/hdds/protocol/MockDatanodeDetails.java | 4 +
.../container/common/helpers/DatanodeIdYaml.java | 35 +
.../common/statemachine/DatanodeStateMachine.java | 2 +
.../SetNodeOperationalStateCommandHandler.java | 157 +++++
.../states/endpoint/HeartbeatEndpointTask.java | 12 +
.../commands/SetNodeOperationalStateCommand.java | 89 +++
...inerLocationProtocolClientSideTranslatorPB.java | 85 ++-
.../src/main/proto/ScmAdminProtocol.proto | 47 +-
.../interface-client/src/main/proto/hdds.proto | 13 +-
.../interface-client/src/main/resources/proto.lock | 8 -
.../proto/ScmServerDatanodeHeartbeatProtocol.proto | 8 +
.../hadoop/hdds/scm/SCMCommonPlacementPolicy.java | 4 +-
.../hdds/scm/block/SCMBlockDeletingService.java | 9 +-
.../hdds/scm/container/ContainerReplicaCount.java | 271 ++++++++
.../hdds/scm/container/ReplicationManager.java | 304 ++++++---
.../apache/hadoop/hdds/scm/events/SCMEvents.java | 6 +
...anagerMXBean.java => DatanodeAdminMonitor.java} | 27 +-
.../hdds/scm/node/DatanodeAdminMonitorImpl.java | 371 +++++++++++
.../apache/hadoop/hdds/scm/node/DatanodeInfo.java | 50 +-
.../hadoop/hdds/scm/node/DeadNodeHandler.java | 7 +-
.../hdds/scm/node/InvalidHostStringException.java | 34 +
.../hdds/scm/node/InvalidNodeStateException.java | 34 +
.../hadoop/hdds/scm/node/NewNodeHandler.java | 20 +
.../hdds/scm/node/NodeDecommissionManager.java | 369 +++++++++++
.../apache/hadoop/hdds/scm/node/NodeManager.java | 59 +-
.../hadoop/hdds/scm/node/NodeManagerMXBean.java | 2 +-
.../hadoop/hdds/scm/node/NodeStateManager.java | 317 +++++----
.../apache/hadoop/hdds/scm/node/NodeStatus.java | 206 ++++++
.../hadoop/hdds/scm/node/SCMNodeManager.java | 241 +++++--
.../hadoop/hdds/scm/node/SCMNodeMetrics.java | 100 +--
.../hdds/scm/node/StartDatanodeAdminHandler.java | 68 ++
.../hadoop/hdds/scm/node/states/NodeStateMap.java | 244 +++++--
.../hdds/scm/pipeline/PipelinePlacementPolicy.java | 3 +-
.../hadoop/hdds/scm/pipeline/PipelineProvider.java | 6 +-
.../hdds/scm/pipeline/RatisPipelineProvider.java | 6 +-
.../hdds/scm/pipeline/SimplePipelineProvider.java | 1 -
...inerLocationProtocolServerSideTranslatorPB.java | 61 +-
.../hdds/scm/server/SCMClientProtocolServer.java | 97 ++-
.../hdds/scm/server/SCMDatanodeProtocolServer.java | 8 +
.../hdds/scm/server/StorageContainerManager.java | 35 +-
.../hadoop/hdds/scm/block/TestBlockManager.java | 5 +-
.../hadoop/hdds/scm/container/MockNodeManager.java | 77 ++-
.../hdds/scm/container/SimpleMockNodeManager.java | 323 ++++++++++
.../scm/container/TestContainerReportHandler.java | 18 +-
.../hdds/scm/container/TestReplicationManager.java | 285 ++++++++-
.../scm/container/TestUnknownContainerReport.java | 4 +-
.../algorithms/TestContainerPlacementFactory.java | 13 +-
.../TestSCMContainerPlacementCapacity.java | 4 +-
.../TestSCMContainerPlacementRackAware.java | 18 +-
.../TestSCMContainerPlacementRandom.java | 4 +-
.../states/TestContainerReplicaCount.java | 465 ++++++++++++++
.../hdds/scm/node/TestContainerPlacement.java | 2 +-
.../hdds/scm/node/TestDatanodeAdminMonitor.java | 530 +++++++++++++++
.../hadoop/hdds/scm/node/TestDeadNodeHandler.java | 29 +-
.../hdds/scm/node/TestNodeDecommissionManager.java | 297 +++++++++
.../hadoop/hdds/scm/node/TestNodeStateManager.java | 308 +++++++++
.../hadoop/hdds/scm/node/TestSCMNodeManager.java | 214 +++++--
.../hdds/scm/node/states/TestNodeStateMap.java | 140 ++++
.../TestPipelineDatanodesIntersection.java | 3 +-
.../scm/pipeline/TestPipelinePlacementPolicy.java | 9 +-
.../scm/pipeline/TestRatisPipelineProvider.java | 5 +-
.../hdds/scm/pipeline/TestSCMPipelineManager.java | 3 +-
.../placement/TestContainerPlacement.java | 6 +-
.../testutils/ReplicationNodeManagerMock.java | 85 ++-
.../hadoop/ozone/scm/node/TestSCMNodeMetrics.java | 77 ++-
hadoop-hdds/tools/pom.xml | 6 +
.../hdds/scm/cli/ContainerOperationClient.java | 35 +-
.../hadoop/hdds/scm/cli/TopologySubcommand.java | 42 +-
.../hdds/scm/cli/datanode/DatanodeCommands.java | 5 +-
...deCommands.java => DecommissionSubCommand.java} | 47 +-
.../hdds/scm/cli/datanode/ListInfoSubcommand.java | 48 +-
...odeCommands.java => MaintenanceSubCommand.java} | 52 +-
...deCommands.java => RecommissionSubCommand.java} | 49 +-
.../scm/cli/datanode/TestListInfoSubcommand.java | 119 ++++
.../dist/src/main/smoketest/topology/cli.robot | 4 +-
.../TestRatisPipelineCreateAndDestroy.java | 3 +-
.../hadoop/ozone/TestStorageContainerManager.java | 5 +-
.../ozone/client/rpc/TestKeyInputStream.java | 21 +-
.../hadoop/ozone/scm/TestSCMNodeManagerMXBean.java | 30 +-
.../scm/node/TestDecommissionAndMaintenance.java | 708 +++++++++++++++++++++
.../hadoop/ozone/scm/node/TestQueryNode.java | 67 +-
.../org/apache/hadoop/ozone/om/OzoneManager.java | 4 +-
.../ozone/recon/api/ClusterStateEndpoint.java | 5 +-
.../hadoop/ozone/recon/api/NodeEndpoint.java | 7 +-
89 files changed, 6991 insertions(+), 790 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org