hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sha...@apache.org
Subject svn commit: r763217 - in /hadoop/core/branches/branch-0.20: CHANGES.txt src/test/org/apache/hadoop/mapred/TestJobHistory.java
Date Wed, 08 Apr 2009 12:36:04 GMT
Author: sharad
Date: Wed Apr  8 12:36:04 2009
New Revision: 763217

URL: http://svn.apache.org/viewvc?rev=763217&view=rev
Log:
HADOOP-5521. Removes dependency of TestJobInProgress on RESTART_COUNT JobHistory tag. Contributed
by Ravi Gummadi.

Modified:
    hadoop/core/branches/branch-0.20/CHANGES.txt
    hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/mapred/TestJobHistory.java

Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=763217&r1=763216&r2=763217&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Wed Apr  8 12:36:04 2009
@@ -358,6 +358,9 @@
 
     HADOOP-5437. Fix TestMiniMRDFSSort to properly test jvm-reuse. (omalley)
 
+    HADOOP-5521. Removes dependency of TestJobInProgress on RESTART_COUNT 
+    JobHistory tag. (Ravi Gummadi via ddas)
+
   OPTIMIZATIONS
 
     HADOOP-3293. Fixes FileInputFormat to do provide locations for splits

Modified: hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/mapred/TestJobHistory.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/mapred/TestJobHistory.java?rev=763217&r1=763216&r2=763217&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/mapred/TestJobHistory.java
(original)
+++ hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/mapred/TestJobHistory.java
Wed Apr  8 12:36:04 2009
@@ -132,14 +132,13 @@
                   "at line " + lineNum, id != null);
         String time = values.get(Keys.LAUNCH_TIME);
         if (time != null) {
-          if (values.get(Keys.RESTART_COUNT) == null) {// restart is fine
-            assertFalse ("Duplicate Job LAUNCH_TIME is seen in history " +
-                         "file at line " + lineNum, isJobLaunched);
-          }
-          else {// JT restart
+          if (isJobLaunched) {
+            // We assume that if we see LAUNCH_TIME again, it is because of JT restart
             isJTRestarted = true;
           }
-          isJobLaunched = true;
+          else {// job launched first time
+            isJobLaunched = true;
+          }
         }
         time = values.get(Keys.FINISH_TIME);
         if (time != null) {



Mime
View raw message