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/187b9885 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/187b9885 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/187b9885 Branch: refs/heads/YARN-5355 Commit: 187b9885084d8ce9454de6baab0633d092f61571 Parents: 03f8d65 Author: Varun Saxena <varunsax...@apache.org> Authored: Tue Nov 8 04:01:37 2016 +0530 Committer: Varun Saxena <varunsax...@apache.org> Committed: Mon Apr 24 16:17:42 2017 +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/187b9885/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 7d6d8cb..00bd0ef 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 @@ -70,14 +70,14 @@ public interface Context { * @return registering collectors, or null if the timeline service v.2 is not * enabled */ - Map<ApplicationId, AppCollectorData> getRegisteringCollectors(); + ConcurrentMap<ApplicationId, AppCollectorData> 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<ApplicationId, AppCollectorData> getKnownCollectors(); + ConcurrentMap<ApplicationId, AppCollectorData> getKnownCollectors(); ConcurrentMap<ContainerId, Container> getContainers(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/187b9885/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 e8858dc..dc25b52 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 @@ -496,7 +496,7 @@ public class NodeManager extends CompositeService if (knownCollectors == null) { return; } - Map<ApplicationId, AppCollectorData> registeringCollectors + ConcurrentMap<ApplicationId, AppCollectorData> registeringCollectors = context.getRegisteringCollectors(); for (Map.Entry<ApplicationId, AppCollectorData> entry : knownCollectors.entrySet()) { @@ -533,9 +533,10 @@ public class NodeManager extends CompositeService protected final ConcurrentMap<ContainerId, Container> containers = new ConcurrentSkipListMap<ContainerId, Container>(); - private Map<ApplicationId, AppCollectorData> registeringCollectors; + private ConcurrentMap<ApplicationId, AppCollectorData> + registeringCollectors; - private Map<ApplicationId, AppCollectorData> knownCollectors; + private ConcurrentMap<ApplicationId, AppCollectorData> knownCollectors; protected final ConcurrentMap<ContainerId, org.apache.hadoop.yarn.api.records.Container> increasedContainers = @@ -725,12 +726,13 @@ public class NodeManager extends CompositeService } @Override - public Map<ApplicationId, AppCollectorData> getRegisteringCollectors() { + public ConcurrentMap<ApplicationId, AppCollectorData> + getRegisteringCollectors() { return this.registeringCollectors; } @Override - public Map<ApplicationId, AppCollectorData> getKnownCollectors() { + public ConcurrentMap<ApplicationId, AppCollectorData> getKnownCollectors() { return this.knownCollectors; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/187b9885/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 01b42ba..7a6b670 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 @@ -620,11 +620,14 @@ public abstract class BaseAMRMProxyTest { return null; } - public Map<ApplicationId, AppCollectorData> getRegisteringCollectors() { + @Override + public ConcurrentMap<ApplicationId, AppCollectorData> + getRegisteringCollectors() { return null; } - @Override public Map<ApplicationId, AppCollectorData> getKnownCollectors() { + @Override + public ConcurrentMap<ApplicationId, AppCollectorData> getKnownCollectors() { return null; } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
