hadoop-yarn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bi...@apache.org
Subject svn commit: r1502907 - in /hadoop/common/branches/branch-2/hadoop-yarn-project: CHANGES.txt hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java
Date Sat, 13 Jul 2013 22:42:47 GMT
Author: bikas
Date: Sat Jul 13 22:42:47 2013
New Revision: 1502907

URL: http://svn.apache.org/r1502907
Log:
Merge r1502906 from trunk to branch-2 for YARN-541. getAllocatedContainers() is not returning
all the allocated containers (bikas)

Modified:
    hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
    hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java

Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1502907&r1=1502906&r2=1502907&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Sat Jul 13 22:42:47 2013
@@ -666,6 +666,9 @@ Release 2.1.0-beta - 2013-07-02
     from application masters that have not registered (Mayank Bansal &
     Abhishek Kapoor via bikas)
 
+    YARN-541. getAllocatedContainers() is not returning all the allocated
+    containers (bikas)
+
   BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS
 
     YARN-158. Yarn creating package-info.java must not depend on sh.

Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java?rev=1502907&r1=1502906&r2=1502907&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java
(original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java
Sat Jul 13 22:42:47 2013
@@ -230,7 +230,14 @@ public class AMRMClientImpl<T extends Co
     
     try {
       synchronized (this) {
-        askList = new ArrayList<ResourceRequest>(ask);
+        askList = new ArrayList<ResourceRequest>(ask.size());
+        for(ResourceRequest r : ask) {
+          // create a copy of ResourceRequest as we might change it while the 
+          // RPC layer is using it to send info across
+          askList.add(ResourceRequest.newInstance(r.getPriority(),
+              r.getResourceName(), r.getCapability(), r.getNumContainers(),
+              r.getRelaxLocality()));
+        }
         releaseList = new ArrayList<ContainerId>(release);
         // optimistically clear this collection assuming no RPC failure
         ask.clear();



Mime
View raw message