You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sh...@apache.org on 2018/09/22 01:40:12 UTC
[14/18] hadoop git commit: Merge commit
'b3161c4dd9367c68b30528a63c03756eaa32aaf9' into HDFS-12943
Merge commit 'b3161c4dd9367c68b30528a63c03756eaa32aaf9' into HDFS-12943
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4b0ff03f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4b0ff03f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4b0ff03f
Branch: refs/heads/HDFS-12943
Commit: 4b0ff03f6f87dfb3c50f59e12377b9c24c4fc491
Parents: 4cdd0b9 b3161c4
Author: Konstantin V Shvachko <sh...@apache.org>
Authored: Fri Sep 21 18:18:24 2018 -0700
Committer: Konstantin V Shvachko <sh...@apache.org>
Committed: Fri Sep 21 18:18:24 2018 -0700
----------------------------------------------------------------------
.../hadoop/metrics2/annotation/Metric.java | 5 +
.../metrics2/lib/MutableMetricsFactory.java | 4 +
.../apache/hadoop/hdds/scm/XceiverClient.java | 8 +-
.../hadoop/hdds/scm/XceiverClientGrpc.java | 9 +-
.../hadoop/hdds/scm/XceiverClientRatis.java | 36 ++-
.../scm/client/ContainerOperationClient.java | 2 +-
.../org/apache/hadoop/hdds/HddsConfigKeys.java | 11 +
.../apache/hadoop/hdds/scm/ScmConfigKeys.java | 17 +-
.../hadoop/hdds/scm/XceiverClientSpi.java | 10 +-
.../apache/hadoop/ozone/OzoneConfigKeys.java | 12 +
.../main/java/org/apache/ratis/RatisHelper.java | 22 +-
.../common/src/main/resources/ozone-default.xml | 31 ++-
.../container/common/impl/HddsDispatcher.java | 6 +-
.../common/statemachine/StateContext.java | 45 ++++
.../states/endpoint/HeartbeatEndpointTask.java | 28 +++
.../server/ratis/ContainerStateMachine.java | 17 +-
.../server/ratis/XceiverServerRatis.java | 205 ++++++++++++-----
.../container/ozoneimpl/OzoneContainer.java | 2 +-
.../StorageContainerDatanodeProtocol.proto | 26 +++
.../hdds/scm/container/ContainerMapping.java | 109 +++------
.../scm/container/ContainerStateManager.java | 5 +-
.../hadoop/hdds/scm/container/Mapping.java | 14 ++
.../scm/container/closer/ContainerCloser.java | 194 ----------------
.../hadoop/hdds/scm/events/SCMEvents.java | 24 +-
.../hadoop/hdds/scm/node/StaleNodeHandler.java | 16 +-
.../hdds/scm/pipelines/Node2PipelineMap.java | 34 +--
.../pipelines/PipelineActionEventHandler.java | 60 +++++
.../scm/pipelines/PipelineCloseHandler.java | 38 ++++
.../hdds/scm/pipelines/PipelineManager.java | 10 +-
.../hdds/scm/pipelines/PipelineSelector.java | 46 ++--
.../scm/pipelines/ratis/RatisManagerImpl.java | 14 +-
.../standalone/StandaloneManagerImpl.java | 7 +-
.../server/SCMDatanodeHeartbeatDispatcher.java | 23 ++
.../scm/server/StorageContainerManager.java | 13 +-
.../scm/container/TestContainerMapping.java | 43 ----
.../container/closer/TestContainerCloser.java | 228 -------------------
.../mapreduce/v2/hs/HistoryFileManager.java | 12 +-
.../mapreduce/v2/hs/TestHistoryFileManager.java | 52 +++++
.../ozone/om/helpers/OmKeyLocationInfo.java | 10 +
.../hdds/scm/pipeline/TestNode2PipelineMap.java | 6 +-
.../hdds/scm/pipeline/TestNodeFailure.java | 126 ++++++++++
.../hdds/scm/pipeline/TestPipelineClose.java | 6 +-
.../apache/hadoop/ozone/MiniOzoneCluster.java | 15 ++
.../hadoop/ozone/MiniOzoneClusterImpl.java | 21 ++
.../transport/server/ratis/TestCSMMetrics.java | 3 +-
.../container/server/TestContainerServer.java | 3 +-
.../server/TestContainerStateMachine.java | 2 +-
.../hadoop/ozone/om/TestOzoneManager.java | 26 ++-
.../hadoop/ozone/om/VolumeManagerImpl.java | 2 +-
49 files changed, 936 insertions(+), 722 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org