You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by rb...@apache.org on 2015/12/14 07:19:38 UTC

tez git commit: TEZ-2979. FlakyTest: org.apache.tez.history.TestHistoryParser. (rbalamohan)

Repository: tez
Updated Branches:
  refs/heads/branch-0.7 c033a7b0a -> ac03c119a


TEZ-2979. FlakyTest: org.apache.tez.history.TestHistoryParser. (rbalamohan)


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

Branch: refs/heads/branch-0.7
Commit: ac03c119ac0f3c6d1bed1361f76d5b732d40e931
Parents: c033a7b
Author: Rajesh Balamohan <rb...@apache.org>
Authored: Mon Dec 14 11:49:29 2015 +0530
Committer: Rajesh Balamohan <rb...@apache.org>
Committed: Mon Dec 14 11:49:29 2015 +0530

----------------------------------------------------------------------
 CHANGES.txt                                                      | 1 +
 .../src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/ac03c119/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 09e4666..e27ce0f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ INCOMPATIBLE CHANGES
   TEZ-2949. Allow duplicate dag names within session for Tez.
 
 ALL CHANGES
+  TEZ-2979. FlakyTest: org.apache.tez.history.TestHistoryParser.
   TEZ-2684. ShuffleVertexManager.parsePartitionStats throws IllegalStateException: Stats should be initialized.
   TEZ-2496. Consider scheduling tasks in ShuffleVertexManager based on the partition sizes from the source.
   TEZ-2987. TestVertexImpl.testTez2684 fails

http://git-wip-us.apache.org/repos/asf/tez/blob/ac03c119/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 e6841ad..c04f9cb 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
@@ -1256,7 +1256,7 @@ public class DAGImpl implements org.apache.tez.dag.app.dag.DAG,
 
   void logJobHistoryFinishedEvent(TezCounters counters) throws IOException {
     Map<String, Integer> taskStats = constructTaskStats(getDAGProgress());
-    DAGFinishedEvent finishEvt = new DAGFinishedEvent(dagId, clock.getTime(),
+    DAGFinishedEvent finishEvt = new DAGFinishedEvent(dagId, startTime,
         finishTime, DAGState.SUCCEEDED, "", counters,
         this.userName, this.dagName, taskStats, this.appContext.getApplicationAttemptId());
     this.appContext.getHistoryHandler().handleCriticalEvent(
@@ -1266,7 +1266,7 @@ public class DAGImpl implements org.apache.tez.dag.app.dag.DAG,
   void logJobHistoryUnsuccesfulEvent(DAGState state, TezCounters counters) throws IOException {
     Map<String, Integer> taskStats = constructTaskStats(getDAGProgress());
 
-    DAGFinishedEvent finishEvt = new DAGFinishedEvent(dagId, 0L,
+    DAGFinishedEvent finishEvt = new DAGFinishedEvent(dagId, startTime,
         clock.getTime(), state,
         StringUtils.join(getDiagnostics(), LINE_SEPARATOR),
         counters, this.userName, this.dagName, taskStats,