From common-commits-return-88098-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Tue Sep 18 04:05:53 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 28963180677 for ; Tue, 18 Sep 2018 04:05:52 +0200 (CEST) Received: (qmail 64648 invoked by uid 500); 18 Sep 2018 02:05:42 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 58521 invoked by uid 99); 18 Sep 2018 02:05:39 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Sep 2018 02:05:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 43DE5E117C; Tue, 18 Sep 2018 02:05:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shv@apache.org To: common-commits@hadoop.apache.org Date: Tue, 18 Sep 2018 02:06:23 -0000 Message-Id: In-Reply-To: <4b7b3523a17b4bb2800f5ba896d94961@git.apache.org> References: <4b7b3523a17b4bb2800f5ba896d94961@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [47/50] [abbrv] 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/e97b104b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e97b104b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e97b104b Branch: refs/heads/HDFS-12943 Commit: e97b104b7b33f2770a95aee0fbded7a3d3966873 Parents: 1363eff b3161c4 Author: Konstantin V Shvachko Authored: Mon Sep 17 17:43:13 2018 -0700 Committer: Konstantin V Shvachko Committed: Mon Sep 17 17:43:13 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