tez git commit: TEZ-3032. DAG start time getting logged using system time instead of recorded time in startTime field. (hitesh)

[hitesh]

Repository: tez
Updated Branches:
  refs/heads/branch-0.7 f4de7744d -> 7041fa795


TEZ-3032. DAG start time getting logged using system time instead of recorded 
time in startTime field. (hitesh)

(cherry picked from commit 37e70146e9c6162c048af2388f732a701654cda9)

Conflicts:
        CHANGES.txt
        tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/7041fa79
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/7041fa79
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/7041fa79

Branch: refs/heads/branch-0.7
Commit: 7041fa79510d66577efccdf5dcc33e6242b403d5
Parents: f4de774
Author: Hitesh Shah <hit...@apache.org>
Authored: Thu Jan 14 13:49:17 2016 -0800
Committer: Hitesh Shah <hit...@apache.org>
Committed: Thu Jan 14 13:50:38 2016 -0800

----------------------------------------------------------------------
 CHANGES.txt                                               |  1 +
 .../java/org/apache/tez/dag/app/dag/impl/DAGImpl.java     | 10 ++++++++++
 2 files changed, 11 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/7041fa79/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 316d6cd..1fe7627 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ INCOMPATIBLE CHANGES
   TEZ-2972. Avoid task rescheduling when a node turns unhealthy
 
 ALL CHANGES
+  TEZ-3032. DAG start time getting logged using system time instead of 
recorded time in startTime field.
   TEZ-2129. Task and Attempt views should contain links to the logs
   TEZ-3025. InputInitializer creation should use the dag ugi.
   TEZ-2972. Avoid task rescheduling when a node turns unhealthy

http://git-wip-us.apache.org/repos/asf/tez/blob/7041fa79/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java 
b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java
index bb6f474..dd90f38 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java
@@ -1247,10 +1247,20 @@ public class DAGImpl implements 
org.apache.tez.dag.app.dag.DAG,
   }
 
   void logJobHistoryStartedEvent() {
+<<<<<<< HEAD
     DAGStartedEvent startEvt = new DAGStartedEvent(this.dagId,
         this.startTime, this.userName, this.dagName);
     this.appContext.getHistoryHandler().handle(
         new DAGHistoryEvent(dagId, startEvt));
+=======
+    if (recoveryData == null
+        || recoveryData.getDAGStartedEvent() == null) {
+      DAGStartedEvent startEvt = new DAGStartedEvent(this.dagId,
+          this.startTime, this.userName, this.dagName);
+      this.appContext.getHistoryHandler().handle(
+          new DAGHistoryEvent(dagId, startEvt));
+    }
+>>>>>>> 37e7014... TEZ-3032. DAG start time getting logged using system time 
instead of recorded time in startTime field. (hitesh)
   }
 
   void logJobHistoryFinishedEvent(TezCounters counters) throws IOException {