svn commit: r1102503 - in /hadoop/mapreduce/branches/MR-279: ./ mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/ yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/re...

[mahadev]

Author: mahadev
Date: Thu May 12 22:53:23 2011
New Revision: 1102503

URL: http://svn.apache.org/viewvc?rev=1102503&view=rev
Log:
Adding valid state to ASM on a finish when its already completed and also 
disble UberAM. (mahadev)

Modified:
    hadoop/mapreduce/branches/MR-279/CHANGES.txt
    
hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java
    
hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/ApplicationMasterInfo.java

Modified: hadoop/mapreduce/branches/MR-279/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/CHANGES.txt?rev=1102503&r1=1102502&r2=1102503&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/MR-279/CHANGES.txt Thu May 12 22:53:23 2011
@@ -3,6 +3,9 @@ Hadoop MapReduce Change Log
 Trunk (unreleased changes)
 
   MAPREDUCE-279
+    Adding valid state to ASM on a finish when its already completed and 
+    also disble UberAM. (mahadev)
+
     Fix a race in MR task that was causing MR containers to overwrite each
     other's job.xml. Also fix leaking attempt-dirs in app-local-dir. (vinodkv)
 

Modified: 
hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java
URL: 
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java?rev=1102503&r1=1102502&r2=1102503&view=diff
==============================================================================
--- 
hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java
 (original)
+++ 
hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java
 Thu May 12 22:53:23 2011
@@ -742,7 +742,7 @@ public class JobImpl implements org.apac
         //long sysMemSizeForUberSlot = JobTracker.getMemSizeForReduceSlot(); 
// FIXME [could use default AM-container memory size...]
 
         boolean uberEnabled =
-            job.conf.getBoolean(MRJobConfig.JOB_UBERTASK_ENABLE, true);
+            job.conf.getBoolean(MRJobConfig.JOB_UBERTASK_ENABLE, false);
         boolean smallNumMapTasks = (job.numMapTasks <= sysMaxMaps);
         boolean smallNumReduceTasks = (job.numReduceTasks <= sysMaxReduces);
         boolean smallInput = (inputLength <= sysMaxBytes);

Modified: 
hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/ApplicationMasterInfo.java
URL: 
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/ApplicationMasterInfo.java?rev=1102503&r1=1102502&r2=1102503&view=diff
==============================================================================
--- 
hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/ApplicationMasterInfo.java
 (original)
+++ 
hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/ApplicationMasterInfo.java
 Thu May 12 22:53:23 2011
@@ -176,14 +176,21 @@ public class ApplicationMasterInfo imple
   ApplicationEventType.EXPIRE)
 
   .addTransition(ApplicationState.COMPLETED, ApplicationState.COMPLETED,
+  ApplicationEventType.FINISH)
+  
+  .addTransition(ApplicationState.COMPLETED, ApplicationState.COMPLETED,
   ApplicationEventType.RECOVER)
   
   .addTransition(ApplicationState.FAILED, ApplicationState.FAILED,
       ApplicationEventType.RECOVER)
+  .addTransition(ApplicationState.FAILED, ApplicationState.FAILED, 
+     ApplicationEventType.FINISH)
   
   .addTransition(ApplicationState.KILLED, ApplicationState.KILLED, 
       ApplicationEventType.RECOVER)
-
+      
+  .addTransition(ApplicationState.KILLED, ApplicationState.KILLED,
+      ApplicationEventType.FINISH)
   .installTopology();