You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2018/11/19 07:59:55 UTC
[flink] branch master updated: [FLINK-10666] [tests] Port
YarnClusterDescriptorTest to new codebase
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 9f48694 [FLINK-10666] [tests] Port YarnClusterDescriptorTest to new codebase
9f48694 is described below
commit 9f486941ea4ab4d302e42f258c83531583438f64
Author: Tzu-Li Chen <wa...@gmail.com>
AuthorDate: Mon Nov 19 15:59:49 2018 +0800
[FLINK-10666] [tests] Port YarnClusterDescriptorTest to new codebase
---
.../flink/yarn/YarnClusterDescriptorTest.java | 29 ++++++++--------------
1 file changed, 10 insertions(+), 19 deletions(-)
diff --git a/flink-yarn/src/test/java/org/apache/flink/yarn/YarnClusterDescriptorTest.java b/flink-yarn/src/test/java/org/apache/flink/yarn/YarnClusterDescriptorTest.java
index 2726501..16b3586 100644
--- a/flink-yarn/src/test/java/org/apache/flink/yarn/YarnClusterDescriptorTest.java
+++ b/flink-yarn/src/test/java/org/apache/flink/yarn/YarnClusterDescriptorTest.java
@@ -57,7 +57,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
/**
- * Tests for the {@link LegacyYarnClusterDescriptor}.
+ * Tests for the {@link YarnClusterDescriptor}.
*/
public class YarnClusterDescriptorTest extends TestLogger {
@@ -91,11 +91,10 @@ public class YarnClusterDescriptorTest extends TestLogger {
@Test
public void testFailIfTaskSlotsHigherThanMaxVcores() throws ClusterDeploymentException {
-
final Configuration flinkConfiguration = new Configuration();
flinkConfiguration.setInteger(ResourceManagerOptions.CONTAINERIZED_HEAP_CUTOFF_MIN, 0);
- LegacyYarnClusterDescriptor clusterDescriptor = new LegacyYarnClusterDescriptor(
+ YarnClusterDescriptor clusterDescriptor = new YarnClusterDescriptor(
flinkConfiguration,
yarnConfiguration,
temporaryFolder.getRoot().getAbsolutePath(),
@@ -132,7 +131,7 @@ public class YarnClusterDescriptorTest extends TestLogger {
configuration.setInteger(YarnConfigOptions.VCORES, Integer.MAX_VALUE);
configuration.setInteger(ResourceManagerOptions.CONTAINERIZED_HEAP_CUTOFF_MIN, 0);
- LegacyYarnClusterDescriptor clusterDescriptor = new LegacyYarnClusterDescriptor(
+ YarnClusterDescriptor clusterDescriptor = new YarnClusterDescriptor(
configuration,
yarnConfiguration,
temporaryFolder.getRoot().getAbsolutePath(),
@@ -166,7 +165,7 @@ public class YarnClusterDescriptorTest extends TestLogger {
@Test
public void testSetupApplicationMasterContainer() {
Configuration cfg = new Configuration();
- LegacyYarnClusterDescriptor clusterDescriptor = new LegacyYarnClusterDescriptor(
+ YarnClusterDescriptor clusterDescriptor = new YarnClusterDescriptor(
cfg,
yarnConfiguration,
temporaryFolder.getRoot().getAbsolutePath(),
@@ -417,14 +416,12 @@ public class YarnClusterDescriptorTest extends TestLogger {
*/
@Test
public void testExplicitLibShipping() throws Exception {
- AbstractYarnClusterDescriptor descriptor = new LegacyYarnClusterDescriptor(
+ try (YarnClusterDescriptor descriptor = new YarnClusterDescriptor(
new Configuration(),
yarnConfiguration,
temporaryFolder.getRoot().getAbsolutePath(),
yarnClient,
- true);
-
- try {
+ true)) {
descriptor.setLocalJarPath(new Path("/path/to/flink.jar"));
File libFile = temporaryFolder.newFile("libFile.jar");
@@ -450,8 +447,6 @@ public class YarnClusterDescriptorTest extends TestLogger {
Assert.assertEquals(2, descriptor.shipFiles.size());
Assert.assertTrue(descriptor.shipFiles.contains(libFile));
Assert.assertTrue(descriptor.shipFiles.contains(libFolder));
- } finally {
- descriptor.close();
}
}
@@ -460,14 +455,12 @@ public class YarnClusterDescriptorTest extends TestLogger {
*/
@Test
public void testEnvironmentLibShipping() throws Exception {
- AbstractYarnClusterDescriptor descriptor = new LegacyYarnClusterDescriptor(
+ try (YarnClusterDescriptor descriptor = new YarnClusterDescriptor(
new Configuration(),
yarnConfiguration,
temporaryFolder.getRoot().getAbsolutePath(),
yarnClient,
- true);
-
- try {
+ true)) {
File libFolder = temporaryFolder.newFolder().getAbsoluteFile();
File libFile = new File(libFolder, "libFile.jar");
libFile.createNewFile();
@@ -490,8 +483,6 @@ public class YarnClusterDescriptorTest extends TestLogger {
Assert.assertTrue(effectiveShipFiles.contains(libFolder));
Assert.assertFalse(descriptor.shipFiles.contains(libFile));
Assert.assertFalse(descriptor.shipFiles.contains(libFolder));
- } finally {
- descriptor.close();
}
}
@@ -500,7 +491,7 @@ public class YarnClusterDescriptorTest extends TestLogger {
*/
@Test
public void testYarnClientShutDown() {
- LegacyYarnClusterDescriptor yarnClusterDescriptor = new LegacyYarnClusterDescriptor(
+ YarnClusterDescriptor yarnClusterDescriptor = new YarnClusterDescriptor(
new Configuration(),
yarnConfiguration,
temporaryFolder.getRoot().getAbsolutePath(),
@@ -515,7 +506,7 @@ public class YarnClusterDescriptorTest extends TestLogger {
closableYarnClient.init(yarnConfiguration);
closableYarnClient.start();
- yarnClusterDescriptor = new LegacyYarnClusterDescriptor(
+ yarnClusterDescriptor = new YarnClusterDescriptor(
new Configuration(),
yarnConfiguration,
temporaryFolder.getRoot().getAbsolutePath(),