svn commit: r1098842 - in /hadoop/mapreduce/trunk: CHANGES.txt src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairSchedulerSystem.java

[todd]

Author: todd
Date: Mon May  2 23:06:50 2011
New Revision: 1098842

URL: http://svn.apache.org/viewvc?rev=1098842&view=rev
Log:
MAPREDUCE-2460. Fix flaky test TestFairSchedulerSystem. Contributed by Todd 
Lipcon.

Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    
hadoop/mapreduce/trunk/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairSchedulerSystem.java

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=1098842&r1=1098841&r2=1098842&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Mon May  2 23:06:50 2011
@@ -154,6 +154,8 @@ Trunk (unreleased changes)
     MAPREDUCE-2465. Disable raid contrib which is unable to compile after
     HDFS federation merge. (todd)
 
+    MAPREDUCE-2460. Fix flaky test TestFairSchedulerSystem. (todd)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/mapreduce/trunk/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairSchedulerSystem.java
URL: 
http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairSchedulerSystem.java?rev=1098842&r1=1098841&r2=1098842&view=diff
==============================================================================
--- 
hadoop/mapreduce/trunk/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairSchedulerSystem.java
 (original)
+++ 
hadoop/mapreduce/trunk/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairSchedulerSystem.java
 Mon May  2 23:06:50 2011
@@ -123,8 +123,17 @@ public class TestFairSchedulerSystem {
           continue;
         }
         for (JobStatus j : jobs) {
-          System.err.println("Checking task log for " + j.getJobID());
-          checkTaskGraphServlet(j.getJobID());
+          System.err.println("Checking task graph for " + j.getJobID());
+          try {
+            checkTaskGraphServlet(j.getJobID());
+          } catch (AssertionError err) {
+            // The task graph servlet will be empty if the job has retired.
+            // This is OK.
+            RunningJob rj = jc.getJob(j.getJobID());
+            if (!rj.isRetired()) {
+              throw err;
+            }
+          }
         }
       }
     }