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/04/02 20:07:38 UTC
git commit: TEZ-1011. TestDAGRecovery timing out on jenkins builds.
(hitesh)
Repository: incubator-tez
Updated Branches:
refs/heads/master e23c24bfe -> 3a3185596
TEZ-1011. TestDAGRecovery timing out on jenkins builds. (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/3a318559
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/3a318559
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/3a318559
Branch: refs/heads/master
Commit: 3a3185596327cbf493eb177f094153a98a8af790
Parents: e23c24b
Author: Hitesh Shah <hi...@apache.org>
Authored: Wed Apr 2 11:07:19 2014 -0700
Committer: Hitesh Shah <hi...@apache.org>
Committed: Wed Apr 2 11:07:19 2014 -0700
----------------------------------------------------------------------
.../tez/dag/app/dag/event/TaskEventRecoverTask.java | 12 ++++++++++++
.../java/org/apache/tez/dag/app/dag/impl/TaskImpl.java | 3 ++-
.../org/apache/tez/dag/app/dag/impl/VertexImpl.java | 2 +-
3 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/3a318559/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/TaskEventRecoverTask.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/TaskEventRecoverTask.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/TaskEventRecoverTask.java
index e7e59e3..f275a56 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/TaskEventRecoverTask.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/TaskEventRecoverTask.java
@@ -25,9 +25,17 @@ public class TaskEventRecoverTask extends TaskEvent {
TaskState desiredState;
+ boolean recoverDataForAttempts;
+
public TaskEventRecoverTask(TezTaskID taskID, TaskState desiredState) {
+ this(taskID, desiredState, true);
+ }
+
+ public TaskEventRecoverTask(TezTaskID taskID, TaskState desiredState,
+ boolean recoverData) {
super(taskID, TaskEventType.T_RECOVER);
this.desiredState = desiredState;
+ this.recoverDataForAttempts = recoverData;
}
public TaskEventRecoverTask(TezTaskID taskID) {
@@ -38,4 +46,8 @@ public class TaskEventRecoverTask extends TaskEvent {
return desiredState;
}
+ public boolean recoverData() {
+ return recoverDataForAttempts;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/3a318559/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java
index 918a9e8..c06509b 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java
@@ -1088,7 +1088,8 @@ public class TaskImpl implements Task, EventHandler<TaskEvent> {
if (taskEvent instanceof TaskEventRecoverTask) {
TaskEventRecoverTask taskEventRecoverTask =
(TaskEventRecoverTask) taskEvent;
- if (taskEventRecoverTask.getDesiredState() != null) {
+ if (taskEventRecoverTask.getDesiredState() != null
+ && !taskEventRecoverTask.recoverData()) {
// TODO recover attempts if desired state is given?
// History may not have all data.
switch (taskEventRecoverTask.getDesiredState()) {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/3a318559/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 975a58e..270c5ac 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
@@ -1790,7 +1790,7 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
for (Task task : vertex.tasks.values()) {
vertex.eventHandler.handle(
new TaskEventRecoverTask(task.getTaskId(),
- taskState));
+ taskState, false));
}
}
LOG.info("DAG informed Vertex of its final completed state"