Merge branch 'trunk' 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/ebd3d6ab Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ebd3d6ab Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ebd3d6ab Branch: refs/heads/HDFS-12943 Commit: ebd3d6abd4efa8d9ff4c4b5c293206ab2481bfdf Parents: 8aeb2d8 a4121c7 Author: Konstantin V Shvachko <s...@apache.org> Authored: Sat Aug 25 17:29:34 2018 -0700 Committer: Konstantin V Shvachko <s...@apache.org> Committed: Sat Aug 25 17:29:34 2018 -0700 ---------------------------------------------------------------------- .../hadoop/io/retry/FailoverProxyProvider.java | 15 +- .../apache/hadoop/hdds/scm/ScmConfigKeys.java | 6 +- .../common/src/main/resources/ozone-default.xml | 7 +- .../container/common/impl/ContainerData.java | 2 +- .../statemachine/DatanodeStateMachine.java | 5 +- .../common/statemachine/StateContext.java | 20 +++ .../states/datanode/RunningDatanodeState.java | 1 + .../states/endpoint/RegisterEndpointTask.java | 28 +++- .../keyvalue/KeyValueContainerData.java | 10 +- .../container/keyvalue/KeyValueHandler.java | 7 +- .../hadoop/hdds/scm/block/BlockManagerImpl.java | 9 +- .../hdds/scm/container/ContainerMapping.java | 33 ++-- .../scm/container/ContainerReportHandler.java | 3 +- .../scm/container/ContainerStateManager.java | 9 +- .../hadoop/hdds/scm/container/Mapping.java | 2 +- .../hdds/scm/pipelines/PipelineSelector.java | 9 +- .../scm/server/SCMDatanodeProtocolServer.java | 2 +- .../TestCloseContainerEventHandler.java | 8 +- .../scm/container/TestContainerMapping.java | 19 ++- .../container/closer/TestContainerCloser.java | 9 +- .../ozone/container/common/TestEndPoint.java | 3 +- .../org/apache/hadoop/hdds/scm/cli/SCMCLI.java | 8 +- .../ha/AbstractNNFailoverProxyProvider.java | 152 ++++++++++++++++++- .../ha/ConfiguredFailoverProxyProvider.java | 141 ++--------------- .../namenode/ha/IPFailoverProxyProvider.java | 51 +------ .../commandhandler/TestBlockDeletion.java | 3 +- .../TestCloseContainerHandler.java | 4 +- .../TestReplicateContainerHandler.java | 5 +- .../yarn/sls/scheduler/SchedulerMetrics.java | 7 +- 29 files changed, 322 insertions(+), 256 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
