From 7953ac4da6e22bdde7a2c725eaf52b81e1429894 Mon Sep 17 00:00:00 2001 From: Robert Kanter Date: Tue, 7 Mar 2017 13:34:46 -0800 Subject: [PATCH] MAPREDUCE-6839. TestRecovery.testCrashed failed (pairg via rkanter) (cherry picked from commit 38d75dfd3a643f8a1acd52e025a466d65065b60e) --- .../apache/hadoop/mapreduce/v2/app/TestRecovery.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRecovery.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRecovery.java index 071575a156a..6332c5d825e 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRecovery.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRecovery.java @@ -159,9 +159,7 @@ public class TestRecovery { app.waitForState(task1Attempt1, TaskAttemptState.RUNNING); app.waitForState(task2Attempt, TaskAttemptState.RUNNING); - // reduces must be in NEW state - Assert.assertEquals("Reduce Task state not correct", - TaskState.RUNNING, reduceTask.getReport().getTaskState()); + app.waitForState(reduceTask, TaskState.RUNNING); /////////// Play some games with the TaskAttempts of the first task ////// //send the fail signal to the 1st map task attempt @@ -1301,9 +1299,7 @@ public class TestRecovery { app.waitForState(task1Attempt2, TaskAttemptState.RUNNING); app.waitForState(task2Attempt, TaskAttemptState.RUNNING); - // reduces must be in NEW state - Assert.assertEquals("Reduce Task state not correct", - TaskState.RUNNING, reduceTask.getReport().getTaskState()); + app.waitForState(reduceTask, TaskState.RUNNING); //send the done signal to the map 1 attempt 1 app.getContext().getEventHandler().handle( @@ -1431,9 +1427,7 @@ public class TestRecovery { app.waitForState(task1Attempt, TaskAttemptState.RUNNING); app.waitForState(task2Attempt, TaskAttemptState.RUNNING); - // reduces must be in NEW state - Assert.assertEquals("Reduce Task state not correct", - TaskState.RUNNING, reduceTask.getReport().getTaskState()); + app.waitForState(reduceTask, TaskState.RUNNING); //send the done signal to the 1st map attempt app.getContext().getEventHandler().handle(