svn commit: r1293452 - in /incubator/oozie/trunk: ./ core/src/main/java/org/apache/oozie/ core/src/main/java/org/apache/oozie/command/wf/

[an...@apache.org]

Author: angeloh
Date: Fri Feb 24 22:11:07 2012
New Revision: 1293452

URL: http://svn.apache.org/viewvc?rev=1293452&view=rev
Log:
OOZIE-687 The start time of the action is set after the job is already submitted to hadoop (Mohamed Battisha vis Angelo)

Modified:
    incubator/oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowActionBean.java
    incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionStartXCommand.java
    incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionXCommand.java
    incubator/oozie/trunk/release-log.txt

Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowActionBean.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowActionBean.java?rev=1293452&r1=1293451&r2=1293452&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowActionBean.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowActionBean.java Fri Feb 24 22:11:07 2012
@@ -337,7 +337,9 @@ public class WorkflowActionBean extends 
         setTrackerUri(ParamChecker.notEmpty(trackerUri, "trackerUri"));
         setConsoleUrl(ParamChecker.notEmpty(consoleUrl, "consoleUrl"));
         Date now = new Date();
-        setStartTime(now);
+        if (this.startTimestamp == null) {
+            setStartTime(now);
+        }
         setLastCheckTime(now);
         setStatus(Status.RUNNING);
     }

Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionStartXCommand.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionStartXCommand.java?rev=1293452&r1=1293451&r2=1293452&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionStartXCommand.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionStartXCommand.java Fri Feb 24 22:11:07 2012
@@ -190,6 +190,7 @@ public class ActionStartXCommand extends
 
             Instrumentation.Cron cron = new Instrumentation.Cron();
             cron.start();
+            context.setStartTime();
             executor.start(context, wfAction);
             cron.stop();
             FaultInjection.activate("org.apache.oozie.command.SkipCommitFaultInjection");

Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionXCommand.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionXCommand.java?rev=1293452&r1=1293451&r2=1293452&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionXCommand.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionXCommand.java Fri Feb 24 22:11:07 2012
@@ -300,6 +300,11 @@ public abstract class ActionXCommand<T> 
             started = true;
         }
 
+        public void setStartTime() {
+            Date now = new Date();
+            action.setStartTime(now);
+        }
+
         public void setExecutionData(String externalStatus, Properties actionData) {
             action.setExecutionData(externalStatus, actionData);
             executed = true;

Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1293452&r1=1293451&r2=1293452&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Fri Feb 24 22:11:07 2012
@@ -1,5 +1,6 @@
 -- Oozie 3.2.0 release
 
+OOZIE-687 The start time of the action is set after the job is already submitted to hadoop (Mohamed Battisha vis Angelo)
 OOZIE-712 Hive testcases fail with 0.23 (tucu)
 OOZIE-710 add a timeout to the surefire configuration (tucu)
 OOZIE-704 Sharelib action JARs for testcases should be collected leveraging Maven dependency information (tucu)