diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java index 8ca386e..2e4f1fa 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java @@ -488,11 +488,9 @@ public void testTimelineEventHandling() throws Exception { TestParams t = new TestParams(false); Configuration conf = new YarnConfiguration(); conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true); - MiniYARNCluster yarnCluster = null; long currentTime = System.currentTimeMillis(); - try { - yarnCluster = new MiniYARNCluster( - TestJobHistoryEventHandler.class.getSimpleName(), 1, 1, 1, 1); + try (MiniYARNCluster yarnCluster = new MiniYARNCluster( + TestJobHistoryEventHandler.class.getSimpleName(), 1, 1, 1, 1)) { yarnCluster.init(conf); yarnCluster.start(); Configuration confJHEH = new YarnConfiguration(conf); @@ -645,10 +643,6 @@ public void testTimelineEventHandling() throws Exception { tEntity.getEvents().get(0).getEventInfo().get("TASK_TYPE")); Assert.assertEquals(TaskType.MAP.toString(), tEntity.getEvents().get(1).getEventInfo().get("TASK_TYPE")); - } finally { - if (yarnCluster != null) { - yarnCluster.stop(); - } } } diff --git a/hadoop-tools/hadoop-archive-logs/src/test/java/org/apache/hadoop/tools/TestHadoopArchiveLogs.java b/hadoop-tools/hadoop-archive-logs/src/test/java/org/apache/hadoop/tools/TestHadoopArchiveLogs.java index d2d7801..73e7efc 100644 --- a/hadoop-tools/hadoop-archive-logs/src/test/java/org/apache/hadoop/tools/TestHadoopArchiveLogs.java +++ b/hadoop-tools/hadoop-archive-logs/src/test/java/org/apache/hadoop/tools/TestHadoopArchiveLogs.java @@ -165,13 +165,10 @@ public void testCheckMaxEligible() throws Exception { @Test(timeout = 30000) public void testFilterAppsByAggregatedStatus() throws Exception { - MiniYARNCluster yarnCluster = null; - try { + try (MiniYARNCluster yarnCluster = + new MiniYARNCluster(TestHadoopArchiveLogs.class.getSimpleName(), 1,1, 1, 1)){ Configuration conf = new Configuration(); conf.setBoolean(YarnConfiguration.LOG_AGGREGATION_ENABLED, true); - yarnCluster = - new MiniYARNCluster(TestHadoopArchiveLogs.class.getSimpleName(), 1, - 1, 1, 1); yarnCluster.init(conf); yarnCluster.start(); conf = yarnCluster.getConfig(); @@ -237,10 +234,6 @@ public void testFilterAppsByAggregatedStatus() throws Exception { Assert.assertTrue(hal.eligibleApplications.contains(app4)); Assert.assertTrue(hal.eligibleApplications.contains(app7)); Assert.assertTrue(hal.eligibleApplications.contains(app8)); - } finally { - if (yarnCluster != null) { - yarnCluster.stop(); - } } } diff --git a/hadoop-tools/hadoop-archive-logs/src/test/java/org/apache/hadoop/tools/TestHadoopArchiveLogsRunner.java b/hadoop-tools/hadoop-archive-logs/src/test/java/org/apache/hadoop/tools/TestHadoopArchiveLogsRunner.java index 098e2fd..fad9b97 100644 --- a/hadoop-tools/hadoop-archive-logs/src/test/java/org/apache/hadoop/tools/TestHadoopArchiveLogsRunner.java +++ b/hadoop-tools/hadoop-archive-logs/src/test/java/org/apache/hadoop/tools/TestHadoopArchiveLogsRunner.java @@ -52,16 +52,14 @@ @Test(timeout = 50000) public void testHadoopArchiveLogs() throws Exception { - MiniYARNCluster yarnCluster = null; MiniDFSCluster dfsCluster = null; FileSystem fs = null; - try { + try (MiniYARNCluster yarnCluster = + new MiniYARNCluster(TestHadoopArchiveLogsRunner.class.getSimpleName(), + 1, 2, 1, 1)) { Configuration conf = new YarnConfiguration(); conf.setBoolean(YarnConfiguration.LOG_AGGREGATION_ENABLED, true); conf.setBoolean(YarnConfiguration.YARN_MINICLUSTER_FIXED_PORTS, true); - yarnCluster = - new MiniYARNCluster(TestHadoopArchiveLogsRunner.class.getSimpleName(), - 1, 2, 1, 1); yarnCluster.init(conf); yarnCluster.start(); conf = yarnCluster.getConfig(); @@ -133,9 +131,6 @@ public int compare(FileStatus o1, FileStatus o2) { harLogs[2].getOwner()); Assert.assertEquals(0, fs.listStatus(workingDir).length); } finally { - if (yarnCluster != null) { - yarnCluster.stop(); - } if (fs != null) { fs.close(); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMProxy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMProxy.java index b92538a..15b789f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMProxy.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMProxy.java @@ -86,11 +86,10 @@ */ @Test(timeout = 60000) public void testAMRMProxyE2E() throws Exception { - MiniYARNCluster cluster = new MiniYARNCluster("testAMRMProxyE2E", 1, 1, 1); YarnClient rmClient = null; ApplicationMasterProtocol client; - try { + try (MiniYARNCluster cluster = new MiniYARNCluster("testAMRMProxyE2E", 1, 1, 1)) { Configuration conf = new YarnConfiguration(); conf.setBoolean(YarnConfiguration.AMRM_PROXY_ENABLED, true); cluster.init(conf); @@ -164,7 +163,6 @@ public void testAMRMProxyE2E() throws Exception { if (rmClient != null) { rmClient.stop(); } - cluster.stop(); } } @@ -175,12 +173,11 @@ public void testAMRMProxyE2E() throws Exception { */ @Test(timeout = 60000) public void testE2ETokenRenewal() throws Exception { - MiniYARNCluster cluster = - new MiniYARNCluster("testE2ETokenRenewal", 1, 1, 1); YarnClient rmClient = null; ApplicationMasterProtocol client; - try { + try (MiniYARNCluster cluster = + new MiniYARNCluster("testE2ETokenRenewal", 1, 1, 1)) { Configuration conf = new YarnConfiguration(); conf.setBoolean(YarnConfiguration.AMRM_PROXY_ENABLED, true); conf.setInt(YarnConfiguration.RM_NM_EXPIRY_INTERVAL_MS, 1500); @@ -244,7 +241,6 @@ public void testE2ETokenRenewal() throws Exception { if (rmClient != null) { rmClient.stop(); } - cluster.stop(); } } @@ -254,11 +250,10 @@ public void testE2ETokenRenewal() throws Exception { */ @Test(timeout = 60000) public void testE2ETokenSwap() throws Exception { - MiniYARNCluster cluster = new MiniYARNCluster("testE2ETokenSwap", 1, 1, 1); YarnClient rmClient = null; ApplicationMasterProtocol client; - try { + try (MiniYARNCluster cluster = new MiniYARNCluster("testE2ETokenSwap", 1, 1, 1)) { Configuration conf = new YarnConfiguration(); conf.setBoolean(YarnConfiguration.AMRM_PROXY_ENABLED, true); cluster.init(conf); @@ -287,7 +282,6 @@ public void testE2ETokenSwap() throws Exception { if (rmClient != null) { rmClient.stop(); } - cluster.stop(); } }