Revert "TEZ-4062. Speculative attempt scheduling should be aborted when Task has completed"
This reverts commit 7d5a1830a51df64b23920901ec2e723999a9dfac.
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 2d0688f..e563fe9 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
@@ -1043,11 +1043,6 @@
LOG.info("Ignore speculation scheduling since there is no running attempt on task {}.", task.getTaskId());
return;
}
- if (task.commitAttempt != null) {
- LOG.info("Ignore speculation scheduling for task {} since commit has started with commitAttempt {}.",
- task.getTaskId(), task.commitAttempt);
- return;
- }
task.addAndScheduleAttempt(earliestUnfinishedAttempt.getID());
}
}
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskImpl.java b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskImpl.java
index a3de936..2d4adcc 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskImpl.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskImpl.java
@@ -999,23 +999,6 @@
assertEquals(1, mockTask.getAttemptList().size());
}
- @Test(timeout = 20000)
- public void testIgnoreSpeculationAfterOriginalAttemptCommit() {
- TezTaskID taskId = getNewTaskID();
- scheduleTaskAttempt(taskId);
- MockTaskAttemptImpl firstAttempt = mockTask.getLastAttempt();
- launchTaskAttempt(firstAttempt.getID());
- updateAttemptState(firstAttempt, TaskAttemptState.RUNNING);
- // Mock commit of the first task attempt
- mockTask.canCommit(firstAttempt.getID());
-
- // Verify the speculation scheduling is ignored and no speculative attempt was added to the task
- mockTask.handle(createTaskTAAddSpecAttempt(firstAttempt.getID()));
- MockTaskAttemptImpl specAttempt = mockTask.getLastAttempt();
- launchTaskAttempt(specAttempt.getID());
- assertEquals(1, mockTask.getAttemptList().size());
- }
-
@SuppressWarnings("rawtypes")
@Test
public void testSucceededAttemptStatusWithRetroActiveFailures() throws InterruptedException {
