Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 441AD200BB9 for ; Mon, 7 Nov 2016 23:32:33 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 42BAB160AE0; Mon, 7 Nov 2016 22:32:33 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 64E2B160AEC for ; Mon, 7 Nov 2016 23:32:32 +0100 (CET) Received: (qmail 29788 invoked by uid 500); 7 Nov 2016 22:32:31 -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 29779 invoked by uid 99); 7 Nov 2016 22:32:31 -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; Mon, 07 Nov 2016 22:32:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6A84AE186F; Mon, 7 Nov 2016 22:32:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: varunsaxena@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-3359. Addendum for Recover collector list when RM fails over (Li Lu via Varun Saxena) Date: Mon, 7 Nov 2016 22:32:31 +0000 (UTC) archived-at: Mon, 07 Nov 2016 22:32:33 -0000 Repository: hadoop Updated Branches: refs/heads/YARN-5355 1c8a57550 -> 25b19178d YARN-3359. Addendum for Recover collector list when RM fails over (Li Lu via Varun Saxena) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/25b19178 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/25b19178 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/25b19178 Branch: refs/heads/YARN-5355 Commit: 25b19178dd53bc0d57ca5fd64d3464af7b59e588 Parents: 1c8a575 Author: Varun Saxena Authored: Tue Nov 8 04:01:37 2016 +0530 Committer: Varun Saxena Committed: Tue Nov 8 04:01:37 2016 +0530 ---------------------------------------------------------------------- .../apache/hadoop/yarn/server/nodemanager/Context.java | 4 ++-- .../hadoop/yarn/server/nodemanager/NodeManager.java | 12 +++++++----- .../server/nodemanager/amrmproxy/BaseAMRMProxyTest.java | 7 +++++-- 3 files changed, 14 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/25b19178/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/Context.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/Context.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/Context.java index b92526b..83c994d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/Context.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/Context.java @@ -79,14 +79,14 @@ public interface Context { * @return registering collectors, or null if the timeline service v.2 is not * enabled */ - Map getRegisteringCollectors(); + ConcurrentMap getRegisteringCollectors(); /** * Get the list of collectors registered with the RM and known by this node. * @return known collectors, or null if the timeline service v.2 is not * enabled. */ - Map getKnownCollectors(); + ConcurrentMap getKnownCollectors(); ConcurrentMap getContainers(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/25b19178/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java index 30ec282..73f4450 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java @@ -489,7 +489,7 @@ public class NodeManager extends CompositeService if (knownCollectors == null) { return; } - Map registeringCollectors + ConcurrentMap registeringCollectors = context.getRegisteringCollectors(); for (Map.Entry entry : knownCollectors.entrySet()) { @@ -526,9 +526,10 @@ public class NodeManager extends CompositeService protected final ConcurrentMap containers = new ConcurrentSkipListMap(); - private Map registeringCollectors; + private ConcurrentMap + registeringCollectors; - private Map knownCollectors; + private ConcurrentMap knownCollectors; protected final ConcurrentMap increasedContainers = @@ -725,12 +726,13 @@ public class NodeManager extends CompositeService } @Override - public Map getRegisteringCollectors() { + public ConcurrentMap + getRegisteringCollectors() { return this.registeringCollectors; } @Override - public Map getKnownCollectors() { + public ConcurrentMap getKnownCollectors() { return this.knownCollectors; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/25b19178/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/BaseAMRMProxyTest.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/BaseAMRMProxyTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/BaseAMRMProxyTest.java index 7c4e1cc..8fd86aa 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/BaseAMRMProxyTest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/BaseAMRMProxyTest.java @@ -619,11 +619,14 @@ public abstract class BaseAMRMProxyTest { return null; } - public Map getRegisteringCollectors() { + @Override + public ConcurrentMap + getRegisteringCollectors() { return null; } - @Override public Map getKnownCollectors() { + @Override + public ConcurrentMap getKnownCollectors() { return null; } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org