tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rbalamo...@apache.org
Subject tez git commit: TEZ-2979. FlakyTest: org.apache.tez.history.TestHistoryParser (rbalamohan)
Date Fri, 11 Dec 2015 05:56:25 GMT
Repository: tez
Updated Branches:
  refs/heads/master 6f1713d03 -> b03faf1ad


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/b03faf1a
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/b03faf1a
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/b03faf1a

Branch: refs/heads/master
Commit: b03faf1ad732c53e42ff59606a2a2b08bde03e33
Parents: 6f1713d
Author: Rajesh Balamohan <rbalamohan@apache.org>
Authored: Fri Dec 11 11:26:12 2015 +0530
Committer: Rajesh Balamohan <rbalamohan@apache.org>
Committed: Fri Dec 11 11:26:12 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/b03faf1a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 276651f..60fb502 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,7 @@ INCOMPATIBLE CHANGES
   TEZ-2949. Allow duplicate dag names within session for Tez.
 
 ALL CHANGES:
+  TEZ-2979. FlakyTest: org.apache.tez.history.TestHistoryParser.
   TEZ-1491. Tez reducer-side merge's counter update is slow.
   TEZ-2943. Change shuffle vertex manager to use per vertex data for auto
   reduce and slow start

http://git-wip-us.apache.org/repos/asf/tez/blob/b03faf1a/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 f3b95f6..3d4539d 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
@@ -1220,7 +1220,7 @@ public class DAGImpl implements org.apache.tez.dag.app.dag.DAG,
     if (recoveryData == null
         || recoveryData.getDAGFinishedEvent() == null) {
       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(
@@ -1233,7 +1233,7 @@ public class DAGImpl implements org.apache.tez.dag.app.dag.DAG,
         || recoveryData.getDAGFinishedEvent() == null) {
       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,


Mime
View raw message