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 2014/03/19 21:20:13 UTC

git commit: TEZ-956. Handle zero task vertices correctly on Recovery. (hitesh)

Repository: incubator-tez
Updated Branches:
  refs/heads/master 8d4b8e9a5 -> ece53e34a


TEZ-956. Handle zero task vertices correctly on Recovery. (hitesh)


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

Branch: refs/heads/master
Commit: ece53e34a627a37765da9706e2022d47eb78972d
Parents: 8d4b8e9
Author: Hitesh Shah <hi...@apache.org>
Authored: Wed Mar 19 13:19:54 2014 -0700
Committer: Hitesh Shah <hi...@apache.org>
Committed: Wed Mar 19 13:19:54 2014 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/ece53e34/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 46c91b1..602bb10 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
@@ -1867,7 +1867,7 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
           } else {
             vertex.tasksNotYetScheduled = false;
             // recover tasks
-            if (vertex.tasks != null) {
+            if (vertex.tasks != null && vertex.numTasks != 0) {
               TaskState taskState = TaskState.KILLED;
               switch (vertex.recoveredState) {
                 case SUCCEEDED:
@@ -2126,7 +2126,7 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
           vertex.tasksNotYetScheduled = false;
           // recover tasks
           assert vertex.tasks.size() == vertex.numTasks;
-          if (vertex.tasks != null) {
+          if (vertex.tasks != null  && vertex.numTasks != 0) {
             TaskState taskState = TaskState.KILLED;
             switch (vertex.recoveredState) {
               case SUCCEEDED: