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/10/17 21:16:33 UTC

git commit: TEZ-1633. Fixed expected values in TestTaskRecovery.testRecovery_OneTAStarted. (Alexander Pivovarov and Jeff Zhang via hitesh)

Repository: tez
Updated Branches:
  refs/heads/master 18b29713a -> b37ce2cd8


TEZ-1633. Fixed expected values in TestTaskRecovery.testRecovery_OneTAStarted. (Alexander Pivovarov and Jeff Zhang via hitesh)


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

Branch: refs/heads/master
Commit: b37ce2cd872155eb1f2e8da56e7afb823b908874
Parents: 18b2971
Author: Hitesh Shah <hi...@apache.org>
Authored: Fri Oct 17 12:16:21 2014 -0700
Committer: Hitesh Shah <hi...@apache.org>
Committed: Fri Oct 17 12:16:21 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/tez/blob/b37ce2cd/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a6da35c..2cc1867 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -38,6 +38,7 @@ ALL CHANGES:
   TEZ-1673. Update the default value for allowed node failures, num events per heartbeat
   and counter update interval.
   TEZ-1462. Remove unnecessary SuppressWarnings.
+  TEZ-1633. Fixed expected values in TestTaskRecovery.testRecovery_OneTAStarted.
 
 Release 0.5.1: 2014-10-02
 

http://git-wip-us.apache.org/repos/asf/tez/blob/b37ce2cd/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskRecovery.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskRecovery.java b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskRecovery.java
index fe7ecff..6aa77a9 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskRecovery.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskRecovery.java
@@ -273,9 +273,12 @@ public class TestTaskRecovery {
     restoreFromFirstTaskAttemptStartEvent(taId);
 
     task.handle(new TaskEventRecoverTask(task.getTaskId()));
+    // wait for the second task attempt is scheduled
+    dispatcher.await();
     assertEquals(TaskStateInternal.RUNNING, task.getInternalState());
-    assertEquals(1, task.getAttempts().size());
-    assertEquals(0, task.getFinishedAttemptsCount());
+    // taskAttempt_1 is recovered to KILLED, and new task attempt is scheduled
+    assertEquals(2, task.getAttempts().size());
+    assertEquals(1, task.finishedAttempts);
     assertEquals(0, task.failedAttempts);
     assertEquals(null, task.successfulAttempt);
   }