hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vino...@apache.org
Subject svn commit: r1136310 - in /hadoop/common/branches/MR-279/mapreduce: CHANGES.txt yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java
Date Thu, 16 Jun 2011 07:44:42 GMT
Author: vinodkv
Date: Thu Jun 16 07:44:42 2011
New Revision: 1136310

URL: http://svn.apache.org/viewvc?rev=1136310&view=rev
Log:
Bug fix to set correct state on containers so as to avoid duplicate containers from RM to
AM. Contributed by Vinod Kumar Vavilapalli.

Modified:
    hadoop/common/branches/MR-279/mapreduce/CHANGES.txt
    hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java

Modified: hadoop/common/branches/MR-279/mapreduce/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/CHANGES.txt?rev=1136310&r1=1136309&r2=1136310&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/CHANGES.txt (original)
+++ hadoop/common/branches/MR-279/mapreduce/CHANGES.txt Thu Jun 16 07:44:42 2011
@@ -5,7 +5,10 @@ Trunk (unreleased changes)
 
     MAPREDUCE-279
 
-    Adding attempts page to the history server UI. (vinodkv
+    Bug fix to set correct state on containers so as to avoid duplicate
+    containers from RM to AM. (vinodkv)
+
+    Adding attempts page to the history server UI. (vinodkv)
 
     Task diagnostic info made available on the AM UI. (vinodkv)
 

Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java?rev=1136310&r1=1136309&r2=1136310&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java
(original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java
Thu Jun 16 07:44:42 2011
@@ -44,6 +44,7 @@ import org.apache.hadoop.yarn.api.record
 import org.apache.hadoop.yarn.api.records.ApplicationMaster;
 import org.apache.hadoop.yarn.api.records.ApplicationStatus;
 import org.apache.hadoop.yarn.api.records.Container;
+import org.apache.hadoop.yarn.api.records.ContainerState;
 import org.apache.hadoop.yarn.api.records.ResourceRequest;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.event.EventHandler;
@@ -152,6 +153,12 @@ AMRMProtocol, EventHandler<ASMEvent<Appl
     ApplicationStatus status = request.getApplicationStatus();
     List<ResourceRequest> ask = request.getAskList();
     List<Container> release = request.getReleaseList();
+    // TODO: This is a hack. Arbitrary changing state can screw things up.
+    // Set Container state as complete, as this will be returned back to AM as
+    // is to inform AM of the list of completed containers.
+    for (Container container : release) {
+      container.setState(ContainerState.COMPLETE);
+    }
     try {
       /* check if its in cache */
       synchronized(responseMap) {



Mime
View raw message