hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tgra...@apache.org
Subject svn commit: r1429376 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
Date Sat, 05 Jan 2013 20:19:18 GMT
Author: tgraves
Date: Sat Jan  5 20:19:18 2013
New Revision: 1429376

URL: http://svn.apache.org/viewvc?rev=1429376&view=rev
Log:
MAPREDUCE-4913. TestMRAppMaster#testMRAppMasterMissingStaging occasionally  exits (Jason Lowe
via tgraves)

Modified:
    hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
    hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1429376&r1=1429375&r2=1429376&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Sat Jan  5 20:19:18
2013
@@ -507,6 +507,9 @@ Release 0.23.6 - UNRELEASED
     MAPREDUCE-4819. AM can rerun job after reporting final job status to the
     client (bobby and Bikas Saha via bobby)
 
+    MAPREDUCE-4913. TestMRAppMaster#testMRAppMasterMissingStaging occasionally 
+    exits (Jason Lowe via tgraves)
+
 Release 0.23.5 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java?rev=1429376&r1=1429375&r2=1429376&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
Sat Jan  5 20:19:18 2013
@@ -295,16 +295,20 @@ public class MRAppMaster extends Composi
       dispatcher = createDispatcher();
       addIfService(dispatcher);
       
+      NoopEventHandler eater = new NoopEventHandler();
+      //We do not have a JobEventDispatcher in this path
+      dispatcher.register(JobEventType.class, eater);
+
       EventHandler<JobHistoryEvent> historyService = null;
       if (copyHistory) {
         historyService = 
           createJobHistoryHandler(context);
         dispatcher.register(org.apache.hadoop.mapreduce.jobhistory.EventType.class,
             historyService);
+      } else {
+        dispatcher.register(org.apache.hadoop.mapreduce.jobhistory.EventType.class,
+            eater);
       }
-      NoopEventHandler eater = new NoopEventHandler();
-      //We do not have a JobEventDispatcher in this path
-      dispatcher.register(JobEventType.class, eater);
       
       // service to allocate containers from RM (if non-uber) or to fake it (uber)
       containerAllocator = createContainerAllocator(null, context);



Mime
View raw message