Repository: hadoop
Updated Branches:
refs/heads/YARN-5355-branch-2 3e4da481d -> 0b89ab247
YARN-3359. Addendum for Recover collector list when RM fails over (Li Lu via
Varun Saxena)
(cherry picked from commit 25b19178dd53bc0d57ca5fd64d3464af7b59e588)
Conflicts:
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0b89ab24
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0b89ab24
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0b89ab24
Branch: refs/heads/YARN-5355-branch-2
Commit: 0b89ab2476721f29d0333e14c5e4242b9b4abbd9
Parents: 3e4da48
Author: Varun Saxena <varunsax...@apache.org>
Authored: Tue Nov 8 04:01:37 2016 +0530
Committer: Varun Saxena <varunsax...@apache.org>
Committed: Tue Nov 8 04:17:56 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/0b89ab24/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 0d71057..e4466ff 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<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/0b89ab24/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 cde571d..15c3c4d 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
@@ -490,7 +490,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()) {
@@ -527,9 +527,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 =
@@ -734,12 +735,13 @@ public class NodeManager extends CompositeService
this.executor = executor;
}
- 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/0b89ab24/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 664027b..79534c5 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<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
