From dbb7e1f48e96ea326382136d80ab34f56b29be55 Mon Sep 17 00:00:00 2001 From: Prabhu Joseph Date: Fri, 6 Sep 2019 23:19:11 +0530 Subject: [PATCH] YARN-9817. Fix failing testcases due to not initialized AsyncDispatcher. --- .../src/test/java/org/apache/hadoop/mapreduce/v2/app/TestMRApp.java | 4 +++- .../org/apache/hadoop/mapreduce/v2/app/TestRuntimeEstimators.java | 6 +++--- .../org/apache/hadoop/mapreduce/v2/app/job/impl/TestJobImpl.java | 3 +++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestMRApp.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestMRApp.java index eaf1070..7e9ec7d 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestMRApp.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestMRApp.java @@ -208,7 +208,9 @@ public void testCompletedMapsForReduceSlowstart() throws Exception { @Test public void testUpdatedNodes() throws Exception { int runCount = 0; - Dispatcher disp = Mockito.spy(new AsyncDispatcher()); + AsyncDispatcher dispatcher = new AsyncDispatcher(); + dispatcher.init(new Configuration()); + Dispatcher disp = Mockito.spy(dispatcher); MRApp app = new MRAppWithHistory(2, 2, false, this.getClass().getName(), true, ++runCount, disp); Configuration conf = new Configuration(); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRuntimeEstimators.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRuntimeEstimators.java index d20b012..da63b06 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRuntimeEstimators.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRuntimeEstimators.java @@ -128,6 +128,9 @@ estimator = testedEstimator; clock = new ControlledClock(); dispatcher = new AsyncDispatcher(); + Configuration conf = new Configuration(); + dispatcher.init(conf); + myJob = null; slotsInUse.set(0); completedMaps.set(0); @@ -137,8 +140,6 @@ clock.tickMsec(1000); - Configuration conf = new Configuration(); - myAppContext = new MyAppContext(MAP_TASKS, REDUCE_TASKS); myJob = myAppContext.getAllJobs().values().iterator().next(); @@ -165,7 +166,6 @@ dispatcher.register(TaskEventType.class, new SpeculationRequestEventHandler()); - dispatcher.init(conf); dispatcher.start(); 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 861dbfa..945b254 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 @@ -499,6 +499,8 @@ public void testKilledDuringKillAbort() throws Exception { // not initializing dispatcher to avoid potential race condition between // the dispatcher thread & test thread - see MAPREDUCE-6831 AsyncDispatcher dispatcher = new AsyncDispatcher(); + dispatcher.init(conf); + OutputCommitter committer = new StubbedOutputCommitter() { @Override @@ -959,6 +961,7 @@ public void testMetaInfoSizeOverMax() throws Exception { public void testJobPriorityUpdate() throws Exception { Configuration conf = new Configuration(); AsyncDispatcher dispatcher = new AsyncDispatcher(); + dispatcher.init(conf); Priority submittedPriority = Priority.newInstance(5); AppContext mockContext = mock(AppContext.class); -- 2.7.4 (Apple Git-66)