You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by hi...@apache.org on 2016/01/14 23:29:35 UTC
tez git commit: Revert "TEZ-3032. DAG start time getting logged using
system time instead of recorded time in startTime field. (hitesh)"
Repository: tez
Updated Branches:
refs/heads/branch-0.7 7ea86c073 -> b1cbae024
Revert "TEZ-3032. DAG start time getting logged using system time instead of recorded time in startTime field. (hitesh)"
This reverts commit 7041fa79510d66577efccdf5dcc33e6242b403d5.
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/b1cbae02
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/b1cbae02
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/b1cbae02
Branch: refs/heads/branch-0.7
Commit: b1cbae02452d574fa0b7463a92f5d7747e208c39
Parents: 7ea86c0
Author: Hitesh Shah <hi...@apache.org>
Authored: Thu Jan 14 14:29:25 2016 -0800
Committer: Hitesh Shah <hi...@apache.org>
Committed: Thu Jan 14 14:29:25 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 -
.../java/org/apache/tez/dag/app/dag/impl/DAGImpl.java | 10 ----------
2 files changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/b1cbae02/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index cc426b7..503d718 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,7 +8,6 @@ INCOMPATIBLE CHANGES
ALL CHANGES
TEZ-3037. History URL should be set regardless of which history logging service is enabled.
- 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/b1cbae02/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 dd90f38..bb6f474 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,20 +1247,10 @@ 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 {