tez git commit: TEZ-2900. Ignore V_INPUT_DATA_INFORMATION when vertex is in Failed/Killed/Error (zjffdu)

[zjffdu]

Repository: tez
Updated Branches:
  refs/heads/branch-0.7 ad303a06d -> 28ef31749


TEZ-2900. Ignore V_INPUT_DATA_INFORMATION when vertex is in Failed/Killed/Error 
(zjffdu)

(cherry picked from commit cf8ed292957c2c4714271baa2ddb712f3014733b)

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

Branch: refs/heads/branch-0.7
Commit: 28ef317498f17afcf62cab908efbee33179156b6
Parents: ad303a0
Author: Jeff Zhang <zjf...@apache.org>
Authored: Thu Oct 29 07:47:02 2015 +0800
Committer: Jeff Zhang <zjf...@apache.org>
Committed: Thu Oct 29 07:49:02 2015 +0800

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


http://git-wip-us.apache.org/repos/asf/tez/blob/28ef3174/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 33699ec..bb45e54 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ Release 0.7.1: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES
+  TEZ-2900. Ignore V_INPUT_DATA_INFORMATION when vertex is in 
Failed/Killed/Error
   TEZ-2904. Pig can't specify task specific command opts
   TEZ-2899. Tez UI: DAG getting created with huge horizontal gap in between 
vertices
   TEZ-2882. Consider improving fetch failure handling

http://git-wip-us.apache.org/repos/asf/tez/blob/28ef3174/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
----------------------------------------------------------------------
diff --git 
a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java 
b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
index 2f81a50..1419b06 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
@@ -607,7 +607,7 @@ public class VertexImpl implements 
org.apache.tez.dag.app.dag.Vertex, EventHandl
                   VertexEventType.V_ROOT_INPUT_INITIALIZED,
                   VertexEventType.V_SOURCE_TASK_ATTEMPT_COMPLETED,
                   VertexEventType.V_NULL_EDGE_INITIALIZED,
-                  VertexEventType.V_ROOT_INPUT_FAILED,
+                  VertexEventType.V_INPUT_DATA_INFORMATION,
                   VertexEventType.V_SOURCE_VERTEX_RECOVERED))
 
           // Transitions from KILLED state
@@ -630,7 +630,7 @@ public class VertexImpl implements 
org.apache.tez.dag.app.dag.Vertex, EventHandl
                   VertexEventType.V_TASK_COMPLETED,
                   VertexEventType.V_ROOT_INPUT_INITIALIZED,
                   VertexEventType.V_NULL_EDGE_INITIALIZED,
-                  VertexEventType.V_ROOT_INPUT_FAILED,
+                  VertexEventType.V_INPUT_DATA_INFORMATION,
                   VertexEventType.V_SOURCE_VERTEX_RECOVERED))
 
           // No transitions from INTERNAL_ERROR state. Ignore all.
@@ -651,7 +651,7 @@ public class VertexImpl implements 
org.apache.tez.dag.app.dag.Vertex, EventHandl
                   VertexEventType.V_INTERNAL_ERROR,
                   VertexEventType.V_ROOT_INPUT_INITIALIZED,
                   VertexEventType.V_NULL_EDGE_INITIALIZED,
-                  VertexEventType.V_ROOT_INPUT_FAILED,
+                  VertexEventType.V_INPUT_DATA_INFORMATION,
                   VertexEventType.V_SOURCE_VERTEX_RECOVERED))
           // create the topology tables
           .installTopology();