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/TestHedgingRequestRMFailoverProxyProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestHedgingRequestRMFailoverProxyProvider.java index 6fd6591..0850b33 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestHedgingRequestRMFailoverProxyProvider.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestHedgingRequestRMFailoverProxyProvider.java @@ -32,8 +32,6 @@ @Test public void testHedgingRequestProxyProvider() throws Exception { - final MiniYARNCluster cluster = - new MiniYARNCluster("testHedgingRequestProxyProvider", 5, 0, 1, 1); Configuration conf = new YarnConfiguration(); conf.setBoolean(YarnConfiguration.RM_HA_ENABLED, true); @@ -42,42 +40,45 @@ public void testHedgingRequestProxyProvider() throws Exception { conf.set(YarnConfiguration.RM_HA_IDS, "rm1,rm2,rm3,rm4,rm5"); conf.set(YarnConfiguration.CLIENT_FAILOVER_PROXY_PROVIDER, - RequestHedgingRMFailoverProxyProvider.class.getName()); + RequestHedgingRMFailoverProxyProvider.class.getName()); conf.setLong(YarnConfiguration.RESOURCEMANAGER_CONNECT_RETRY_INTERVAL_MS, - 2000); + 2000); - HATestUtil.setRpcAddressForRM("rm1", 10000, conf); - HATestUtil.setRpcAddressForRM("rm2", 20000, conf); - HATestUtil.setRpcAddressForRM("rm3", 30000, conf); - HATestUtil.setRpcAddressForRM("rm4", 40000, conf); - HATestUtil.setRpcAddressForRM("rm5", 50000, conf); - conf.setBoolean(YarnConfiguration.YARN_MINICLUSTER_FIXED_PORTS, true); + try (MiniYARNCluster cluster = + new MiniYARNCluster("testHedgingRequestProxyProvider", 5, 0, 1, 1)) { - cluster.init(conf); - cluster.start(); + HATestUtil.setRpcAddressForRM("rm1", 10000, conf); + HATestUtil.setRpcAddressForRM("rm2", 20000, conf); + HATestUtil.setRpcAddressForRM("rm3", 30000, conf); + HATestUtil.setRpcAddressForRM("rm4", 40000, conf); + HATestUtil.setRpcAddressForRM("rm5", 50000, conf); + conf.setBoolean(YarnConfiguration.YARN_MINICLUSTER_FIXED_PORTS, true); - final YarnClient client = YarnClient.createYarnClient(); - client.init(conf); - client.start(); + cluster.init(conf); + cluster.start(); - // Transition rm5 to active; - long start = System.currentTimeMillis(); - makeRMActive(cluster, 4); - // client will retry until the rm becomes active. - client.getAllQueues(); - long end = System.currentTimeMillis(); - System.out.println("Client call succeeded at " + end); - // should return the response fast - Assert.assertTrue(end - start <= 10000); + final YarnClient client = YarnClient.createYarnClient(); + client.init(conf); + client.start(); - // transition rm5 to standby - cluster.getResourceManager(4).getRMContext().getRMAdminService() - .transitionToStandby(new HAServiceProtocol.StateChangeRequestInfo( - HAServiceProtocol.RequestSource.REQUEST_BY_USER)); + // Transition rm5 to active; + long start = System.currentTimeMillis(); + makeRMActive(cluster, 4); + // client will retry until the rm becomes active. + client.getAllQueues(); + long end = System.currentTimeMillis(); + System.out.println("Client call succeeded at " + end); + // should return the response fast + Assert.assertTrue(end - start <= 10000); - makeRMActive(cluster, 2); - client.getAllQueues(); - cluster.stop(); + // transition rm5 to standby + cluster.getResourceManager(4).getRMContext().getRMAdminService() + .transitionToStandby(new HAServiceProtocol.StateChangeRequestInfo( + HAServiceProtocol.RequestSource.REQUEST_BY_USER)); + + makeRMActive(cluster, 2); + client.getAllQueues(); + } } private void makeRMActive(final MiniYARNCluster cluster, final int index) {