Repository: hadoop Updated Branches: refs/heads/branch-3.1 411e82e72 -> bc4ce6c01
MAPREDUCE-7064. Flaky test TestTaskAttempt#testReducerCustomResourceTypes. Contributed by Peter Bacsko (cherry picked from commit 2626ec35e997c06cda975fbfb2b95da740270059) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bc4ce6c0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bc4ce6c0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bc4ce6c0 Branch: refs/heads/branch-3.1 Commit: bc4ce6c0181891190d7f49cd859c28805319f87a Parents: 411e82e Author: Jason Lowe <[email protected]> Authored: Wed Mar 14 15:05:24 2018 -0500 Committer: Jason Lowe <[email protected]> Committed: Wed Mar 14 15:06:28 2018 -0500 ---------------------------------------------------------------------- .../v2/app/job/impl/TestTaskAttempt.java | 150 +++++++++++-------- 1 file changed, 88 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/bc4ce6c0/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestTaskAttempt.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestTaskAttempt.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestTaskAttempt.java index 43571a9..609923f 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestTaskAttempt.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestTaskAttempt.java @@ -187,77 +187,103 @@ public class TestTaskAttempt{ @Test public void testMRAppHistoryForMap() throws Exception { - MRApp app = new FailingAttemptsMRApp(1, 0); - testMRAppHistory(app); + MRApp app = null; + try { + app = new FailingAttemptsMRApp(1, 0); + testMRAppHistory(app); + } finally { + app.close(); + } } @Test public void testMRAppHistoryForReduce() throws Exception { - MRApp app = new FailingAttemptsMRApp(0, 1); - testMRAppHistory(app); + MRApp app = null; + try { + app = new FailingAttemptsMRApp(0, 1); + testMRAppHistory(app); + } finally { + app.close(); + } } @Test public void testMRAppHistoryForTAFailedInAssigned() throws Exception { // test TA_CONTAINER_LAUNCH_FAILED for map - FailingAttemptsDuringAssignedMRApp app = - new FailingAttemptsDuringAssignedMRApp(1, 0, - TaskAttemptEventType.TA_CONTAINER_LAUNCH_FAILED); - testTaskAttemptAssignedFailHistory(app); - - // test TA_CONTAINER_LAUNCH_FAILED for reduce - app = - new FailingAttemptsDuringAssignedMRApp(0, 1, - TaskAttemptEventType.TA_CONTAINER_LAUNCH_FAILED); - testTaskAttemptAssignedFailHistory(app); - - // test TA_CONTAINER_COMPLETED for map - app = - new FailingAttemptsDuringAssignedMRApp(1, 0, - TaskAttemptEventType.TA_CONTAINER_COMPLETED); - testTaskAttemptAssignedFailHistory(app); - - // test TA_CONTAINER_COMPLETED for reduce - app = - new FailingAttemptsDuringAssignedMRApp(0, 1, - TaskAttemptEventType.TA_CONTAINER_COMPLETED); - testTaskAttemptAssignedFailHistory(app); - - // test TA_FAILMSG for map - app = - new FailingAttemptsDuringAssignedMRApp(1, 0, - TaskAttemptEventType.TA_FAILMSG); - testTaskAttemptAssignedFailHistory(app); - - // test TA_FAILMSG for reduce - app = - new FailingAttemptsDuringAssignedMRApp(0, 1, - TaskAttemptEventType.TA_FAILMSG); - testTaskAttemptAssignedFailHistory(app); - - // test TA_FAILMSG_BY_CLIENT for map - app = - new FailingAttemptsDuringAssignedMRApp(1, 0, - TaskAttemptEventType.TA_FAILMSG_BY_CLIENT); - testTaskAttemptAssignedFailHistory(app); - - // test TA_FAILMSG_BY_CLIENT for reduce - app = - new FailingAttemptsDuringAssignedMRApp(0, 1, - TaskAttemptEventType.TA_FAILMSG_BY_CLIENT); - testTaskAttemptAssignedFailHistory(app); - - // test TA_KILL for map - app = - new FailingAttemptsDuringAssignedMRApp(1, 0, - TaskAttemptEventType.TA_KILL); - testTaskAttemptAssignedKilledHistory(app); - - // test TA_KILL for reduce - app = - new FailingAttemptsDuringAssignedMRApp(0, 1, - TaskAttemptEventType.TA_KILL); - testTaskAttemptAssignedKilledHistory(app); + FailingAttemptsDuringAssignedMRApp app = null; + + try { + app = + new FailingAttemptsDuringAssignedMRApp(1, 0, + TaskAttemptEventType.TA_CONTAINER_LAUNCH_FAILED); + testTaskAttemptAssignedFailHistory(app); + app.close(); + + // test TA_CONTAINER_LAUNCH_FAILED for reduce + app = + new FailingAttemptsDuringAssignedMRApp(0, 1, + TaskAttemptEventType.TA_CONTAINER_LAUNCH_FAILED); + testTaskAttemptAssignedFailHistory(app); + app.close(); + + // test TA_CONTAINER_COMPLETED for map + app = + new FailingAttemptsDuringAssignedMRApp(1, 0, + TaskAttemptEventType.TA_CONTAINER_COMPLETED); + testTaskAttemptAssignedFailHistory(app); + app.close(); + + // test TA_CONTAINER_COMPLETED for reduce + app = + new FailingAttemptsDuringAssignedMRApp(0, 1, + TaskAttemptEventType.TA_CONTAINER_COMPLETED); + testTaskAttemptAssignedFailHistory(app); + app.close(); + + // test TA_FAILMSG for map + app = + new FailingAttemptsDuringAssignedMRApp(1, 0, + TaskAttemptEventType.TA_FAILMSG); + testTaskAttemptAssignedFailHistory(app); + app.close(); + + // test TA_FAILMSG for reduce + app = + new FailingAttemptsDuringAssignedMRApp(0, 1, + TaskAttemptEventType.TA_FAILMSG); + testTaskAttemptAssignedFailHistory(app); + app.close(); + + // test TA_FAILMSG_BY_CLIENT for map + app = + new FailingAttemptsDuringAssignedMRApp(1, 0, + TaskAttemptEventType.TA_FAILMSG_BY_CLIENT); + testTaskAttemptAssignedFailHistory(app); + app.close(); + + // test TA_FAILMSG_BY_CLIENT for reduce + app = + new FailingAttemptsDuringAssignedMRApp(0, 1, + TaskAttemptEventType.TA_FAILMSG_BY_CLIENT); + testTaskAttemptAssignedFailHistory(app); + app.close(); + + // test TA_KILL for map + app = + new FailingAttemptsDuringAssignedMRApp(1, 0, + TaskAttemptEventType.TA_KILL); + testTaskAttemptAssignedKilledHistory(app); + app.close(); + + // test TA_KILL for reduce + app = + new FailingAttemptsDuringAssignedMRApp(0, 1, + TaskAttemptEventType.TA_KILL); + testTaskAttemptAssignedKilledHistory(app); + app.close(); + } finally { + app.close(); + } } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
