YARN-8422. TestAMSimulator failing with NPE. Contributed by Giovanni Matteo Fumarola.
(cherry picked from commit c35481594ffc372e3f846b0c8ebc2ff9e36ffdb0) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2f05744c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2f05744c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2f05744c Branch: refs/heads/branch-2.9 Commit: 2f05744ce834037b2d620d977ae7a159ed483b52 Parents: ae85eb4 Author: Inigo Goiri <inigo...@apache.org> Authored: Tue Jun 12 10:59:50 2018 -0700 Committer: Inigo Goiri <inigo...@apache.org> Committed: Tue Jun 12 11:02:38 2018 -0700 ---------------------------------------------------------------------- .../hadoop/yarn/sls/appmaster/TestAMSimulator.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f05744c/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java index 02dc26e..1963e96 100644 --- a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java +++ b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java @@ -48,8 +48,8 @@ public class TestAMSimulator { private YarnConfiguration conf; private Path metricOutputDir; - private Class slsScheduler; - private Class scheduler; + private Class<?> slsScheduler; + private Class<?> scheduler; @Parameterized.Parameters public static Collection<Object[]> params() { @@ -59,7 +59,7 @@ public class TestAMSimulator { }); } - public TestAMSimulator(Class slsScheduler, Class scheduler) { + public TestAMSimulator(Class<?> slsScheduler, Class<?> scheduler) { this.slsScheduler = slsScheduler; this.scheduler = scheduler; } @@ -110,7 +110,8 @@ public class TestAMSimulator { } private void createMetricOutputDir() { - Path testDir = Paths.get(System.getProperty("test.build.data")); + Path testDir = + Paths.get(System.getProperty("test.build.data", "target/test-dir")); try { metricOutputDir = Files.createTempDirectory(testDir, "output"); } catch (IOException e) { @@ -148,7 +149,9 @@ public class TestAMSimulator { @After public void tearDown() { - rm.stop(); + if (rm != null) { + rm.stop(); + } deleteMetricOutputDir(); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
