hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From varunsax...@apache.org
Subject hadoop git commit: YARN-3359. Addendum for Recover collector list when RM fails over (Li Lu via Varun Saxena)
Date Mon, 07 Nov 2016 22:32:31 GMT
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 <varunsaxena@apache.org>
Authored: Tue Nov 8 04:01:37 2016 +0530
Committer: Varun Saxena <varunsaxena@apache.org>
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<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/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<ApplicationId, AppCollectorData> registeringCollectors
+    ConcurrentMap<ApplicationId, AppCollectorData> registeringCollectors
         = context.getRegisteringCollectors();
     for (Map.Entry<ApplicationId, AppCollectorData> entry
         : knownCollectors.entrySet()) {
@@ -526,9 +526,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/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<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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message