hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r803519 - in /hadoop/mapreduce/trunk: CHANGES.txt src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java src/test/mapred/org/apache/hadoop/mapred/TestParallelInitialization.java
Date Wed, 12 Aug 2009 14:06:24 GMT
Author: ddas
Date: Wed Aug 12 14:06:24 2009
New Revision: 803519

URL: http://svn.apache.org/viewvc?rev=803519&view=rev
Log:
MAPREDUCE-848. Fixes a problem to do with TestCapacityScheduler failing. Contributed by Amar
Kamat.

Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java
    hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestParallelInitialization.java

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=803519&r1=803518&r2=803519&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Wed Aug 12 14:06:24 2009
@@ -357,3 +357,6 @@
     
     MAPREDUCE-799. Fixes so all of the MRUnit self-tests run.
     (Aaron Kimball via johan)    
+
+    MAPREDUCE-848. Fixes a problem to do with TestCapacityScheduler
+    failing (Amar Kamat via ddas)

Modified: hadoop/mapreduce/trunk/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java?rev=803519&r1=803518&r2=803519&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java
(original)
+++ hadoop/mapreduce/trunk/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java
Wed Aug 12 14:06:24 2009
@@ -512,7 +512,11 @@
       try {
         JobStatus oldStatus = (JobStatus)jip.getStatus().clone();
         jip.initTasks();
-        completeEmptyJob(jip);
+        if (jip.isJobEmpty()) {
+          completeEmptyJob(jip);
+        } else if (!jip.isSetupCleanupRequired()) {
+          jip.completeSetup();
+        }
         JobStatus newStatus = (JobStatus)jip.getStatus().clone();
         JobStatusChangeEvent event = new JobStatusChangeEvent(jip, 
           EventType.RUN_STATE_CHANGED, oldStatus, newStatus);

Modified: hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestParallelInitialization.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestParallelInitialization.java?rev=803519&r1=803518&r2=803519&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestParallelInitialization.java
(original)
+++ hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestParallelInitialization.java
Wed Aug 12 14:06:24 2009
@@ -147,7 +147,11 @@
       try {
         JobStatus prevStatus = (JobStatus)job.getStatus().clone();
         job.initTasks();
-        completeEmptyJob(job);
+        if (job.isJobEmpty()) {
+          completeEmptyJob(job);
+        } else if (!job.isSetupCleanupRequired()) {
+          job.completeSetup();
+        }
         JobStatus newStatus = (JobStatus)job.getStatus().clone();
         if (prevStatus.getRunState() != newStatus.getRunState()) {
           JobStatusChangeEvent event = 



Mime
View raw message