You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by dd...@apache.org on 2009/03/19 13:12:12 UTC

svn commit: r755960 - in /hadoop/core/trunk: CHANGES.txt src/test/org/apache/hadoop/mapred/TestJobHistory.java

Author: ddas
Date: Thu Mar 19 12:12:12 2009
New Revision: 755960

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

Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestJobHistory.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=755960&r1=755959&r2=755960&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Thu Mar 19 12:12:12 2009
@@ -649,6 +649,9 @@
     HADOOP-5275. Add ivy directory and files to built tar.
     (Giridharan Kesavan via nigel)
 
+    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/trunk/src/test/org/apache/hadoop/mapred/TestJobHistory.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestJobHistory.java?rev=755960&r1=755959&r2=755960&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestJobHistory.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestJobHistory.java Thu Mar 19 12:12:12 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) {