tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zjf...@apache.org
Subject tez git commit: TEZ-1816. It is possible to receive START event when DAG is failed (zjffdu)
Date Thu, 04 Dec 2014 01:46:33 GMT
Repository: tez
Updated Branches:
  refs/heads/master 991d3d384 -> 48dddffae


TEZ-1816. It is possible to receive START event when DAG is failed (zjffdu)


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

Branch: refs/heads/master
Commit: 48dddffae5fd41bb06d112fbf581790e9410cb46
Parents: 991d3d3
Author: Jeff Zhang <zjffdu@apache.org>
Authored: Thu Dec 4 09:45:57 2014 +0800
Committer: Jeff Zhang <zjffdu@apache.org>
Committed: Thu Dec 4 09:45:57 2014 +0800

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


http://git-wip-us.apache.org/repos/asf/tez/blob/48dddffa/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5cae713..9eaf37b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ Release 0.6.0: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-1816. It is possible to receive START event when DAG is failed
   TEZ-1787. Counters for speculation
   TEZ-1773. Add attempt failure cause enum to the attempt failed/killed
   history record

http://git-wip-us.apache.org/repos/asf/tez/blob/48dddffa/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 6e7805e..bec3626 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
@@ -316,6 +316,7 @@ public class DAGImpl implements org.apache.tez.dag.app.dag.DAG,
           // Ignore-able events
           .addTransition(DAGState.FAILED, DAGState.FAILED,
               EnumSet.of(DAGEventType.DAG_KILL,
+                  DAGEventType.DAG_START,
                   DAGEventType.DAG_VERTEX_RERUNNING,
                   DAGEventType.DAG_SCHEDULER_UPDATE,
                   DAGEventType.DAG_VERTEX_COMPLETED))

http://git-wip-us.apache.org/repos/asf/tez/blob/48dddffa/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestDAGImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestDAGImpl.java b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestDAGImpl.java
index d859ae0..ba92c40 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestDAGImpl.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestDAGImpl.java
@@ -840,6 +840,10 @@ public class TestDAGImpl {
     dagWithCustomEdge.handle(
         new DAGEvent(dagWithCustomEdge.getID(), DAGEventType.DAG_INIT));
     Assert.assertEquals(DAGState.FAILED, dagWithCustomEdge.getState());
+    // START event is followed after INIT event
+    dagWithCustomEdge.handle(new DAGEvent(dagWithCustomEdge.getID(), DAGEventType.DAG_START));
+    dispatcher.await();
+    Assert.assertEquals(DAGState.FAILED, dagWithCustomEdge.getState());
   }
 
   @Test(timeout = 5000)


Mime
View raw message