Repository: hadoop Updated Branches: refs/heads/branch-2 cca8e9b90 -> f9d609210
MAPREDUCE-6675. TestJobImpl.testUnusableNode failed (haibochen via rkanter) (cherry picked from commit 9d3fcdfbb314c83ba6185e4ac8de649dad51a279) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f9d60921 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f9d60921 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f9d60921 Branch: refs/heads/branch-2 Commit: f9d60921083d38efcd77a47748d6975eefbaab29 Parents: cca8e9b Author: Robert Kanter <rkan...@apache.org> Authored: Wed May 4 22:42:21 2016 -0700 Committer: Robert Kanter <rkan...@apache.org> Committed: Wed May 4 22:42:34 2016 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/mapreduce/v2/app/job/impl/TestJobImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f9d60921/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestJobImpl.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/TestJobImpl.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestJobImpl.java index fa0aef3..36221e0 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestJobImpl.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestJobImpl.java @@ -531,7 +531,7 @@ public class TestJobImpl { Configuration conf = new Configuration(); conf.set(MRJobConfig.MR_AM_STAGING_DIR, stagingDir); conf.setInt(MRJobConfig.NUM_REDUCES, 1); - AsyncDispatcher dispatcher = new AsyncDispatcher(); + DrainDispatcher dispatcher = new DrainDispatcher(); dispatcher.init(conf); dispatcher.start(); CyclicBarrier syncBarrier = new CyclicBarrier(2); @@ -608,6 +608,7 @@ public class TestJobImpl { NodeReport secondMapperNodeReport = nodeReports.get(1); job.handle(new JobUpdatedNodesEvent(job.getID(), Collections.singletonList(firstMapperNodeReport))); + dispatcher.await(); // complete the reducer for (TaskId taskId: job.tasks.keySet()) { if (taskId.getTaskType() == TaskType.REDUCE) { --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
