tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bi...@apache.org
Subject git commit: TEZ-531. DAG_SCHEDULER_UPDATE not handled in ERROR state of DAGImpl (bikas)
Date Sun, 06 Oct 2013 01:02:01 GMT
Updated Branches:
  refs/heads/master fbcf33f75 -> eb92543b3


TEZ-531. DAG_SCHEDULER_UPDATE not handled in ERROR state of DAGImpl (bikas)


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

Branch: refs/heads/master
Commit: eb92543b3fb0fc9f8fd59d6e389bc99650e8fcf4
Parents: fbcf33f
Author: Bikas Saha <bikas@apache.org>
Authored: Sat Oct 5 17:53:58 2013 -0700
Committer: Bikas Saha <bikas@apache.org>
Committed: Sat Oct 5 17:53:58 2013 -0700

----------------------------------------------------------------------
 .../java/org/apache/tez/dag/app/dag/impl/DAGImpl.java   | 12 ++++++++++--
 .../tez/dag/app/rm/TaskSchedulerEventHandler.java       |  2 ++
 2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/eb92543b/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 c81b835..10d36b9 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
@@ -253,6 +253,7 @@ public class DAGImpl implements org.apache.tez.dag.app.dag.DAG,
           // Ignore-able events
           .addTransition(DAGState.SUCCEEDED, DAGState.SUCCEEDED,
               EnumSet.of(DAGEventType.DAG_KILL,
+                  DAGEventType.DAG_SCHEDULER_UPDATE,
                   DAGEventType.DAG_VERTEX_COMPLETED))
 
           // Transitions from FAILED state
@@ -269,6 +270,7 @@ public class DAGImpl implements org.apache.tez.dag.app.dag.DAG,
           .addTransition(DAGState.FAILED, DAGState.FAILED,
               EnumSet.of(DAGEventType.DAG_KILL,
                   DAGEventType.DAG_VERTEX_RERUNNING,
+                  DAGEventType.DAG_SCHEDULER_UPDATE,
                   DAGEventType.DAG_VERTEX_COMPLETED))
 
           // Transitions from KILLED state
@@ -293,11 +295,17 @@ public class DAGImpl implements org.apache.tez.dag.app.dag.DAG,
           .addTransition(
               DAGState.ERROR,
               DAGState.ERROR,
-              EnumSet.of(DAGEventType.DAG_INIT,
+              EnumSet.of(
                   DAGEventType.DAG_KILL,
+                  DAGEventType.DAG_INIT,
+                  DAGEventType.DAG_START,
                   DAGEventType.DAG_VERTEX_COMPLETED,
+                  DAGEventType.DAG_VERTEX_RERUNNING,
+                  DAGEventType.DAG_SCHEDULER_UPDATE,
+                  DAGEventType.DAG_COMPLETED,
                   DAGEventType.DAG_DIAGNOSTIC_UPDATE,
-                  DAGEventType.INTERNAL_ERROR))
+                  DAGEventType.INTERNAL_ERROR,
+                  DAGEventType.DAG_COUNTER_UPDATE))
           .addTransition(DAGState.ERROR, DAGState.ERROR,
               DAGEventType.DAG_COUNTER_UPDATE, COUNTER_UPDATE_TRANSITION)
           // create the topology tables

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/eb92543b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java
b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java
index 9e059a9..4cd4940 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java
@@ -428,6 +428,7 @@ public class TaskSchedulerEventHandler extends AbstractService
   public synchronized void appShutdownRequested() {
     // This can happen if the RM has been restarted. If it is in that state,
     // this application must clean itself up.
+    LOG.info("App shutdown requested by scheduler");
     sendEvent(new DAGAppMasterEvent(DAGAppMasterEventType.INTERNAL_ERROR));
   }
 
@@ -494,6 +495,7 @@ public class TaskSchedulerEventHandler extends AbstractService
 
   @Override
   public void onError(Throwable t) {
+    LOG.info("Error reported by scheduler");
     sendEvent(new DAGAppMasterEvent(DAGAppMasterEventType.INTERNAL_ERROR));
   }
 


Mime
View raw message