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 2022/05/06 07:07:06 UTC
[flink] branch master updated: [FLINK-27477][yarn][tests] Drop flink-yarn test-jar
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 98a6a5432b6 [FLINK-27477][yarn][tests] Drop flink-yarn test-jar
98a6a5432b6 is described below
commit 98a6a5432b642aa647f6edcd60dae49ef9093786
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Mon May 2 11:59:00 2022 +0200
[FLINK-27477][yarn][tests] Drop flink-yarn test-jar
---
flink-yarn-tests/pom.xml | 8 --------
.../org/apache/flink/yarn/YarnConfigurationITCase.java | 5 ++---
.../apache/flink/yarn/YarnPrioritySchedulingITCase.java | 6 ------
.../test/java/org/apache/flink/yarn/YarnTestBase.java | 8 +++++---
flink-yarn/pom.xml | 17 -----------------
5 files changed, 7 insertions(+), 37 deletions(-)
diff --git a/flink-yarn-tests/pom.xml b/flink-yarn-tests/pom.xml
index 6a4ac79ae58..253f2ede2b1 100644
--- a/flink-yarn-tests/pom.xml
+++ b/flink-yarn-tests/pom.xml
@@ -91,14 +91,6 @@ under the License.
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-yarn</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-examples-batch_${scala.binary.version}</artifactId>
diff --git a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnConfigurationITCase.java b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnConfigurationITCase.java
index 73f6e8fef3c..f5473fab912 100644
--- a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnConfigurationITCase.java
+++ b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnConfigurationITCase.java
@@ -19,7 +19,6 @@
package org.apache.flink.yarn;
import org.apache.flink.api.common.time.Time;
-import org.apache.flink.client.cli.CliFrontend;
import org.apache.flink.client.deployment.ClusterSpecification;
import org.apache.flink.client.program.ClusterClient;
import org.apache.flink.client.program.PackagedProgram;
@@ -88,11 +87,11 @@ class YarnConfigurationITCase extends YarnTestBase {
final YarnConfiguration yarnConfiguration = getYarnConfiguration();
final YarnClusterDescriptor clusterDescriptor =
- YarnTestUtils.createClusterDescriptorWithLogging(
- CliFrontend.getConfigurationDirectoryFromEnv(),
+ new YarnClusterDescriptor(
configuration,
yarnConfiguration,
yarnClient,
+ YarnClientYarnClusterInformationRetriever.create(yarnClient),
true);
clusterDescriptor.setLocalJarPath(new Path(flinkUberjar.getAbsolutePath()));
diff --git a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnPrioritySchedulingITCase.java b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnPrioritySchedulingITCase.java
index cf610593e6f..5673aee1e7f 100644
--- a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnPrioritySchedulingITCase.java
+++ b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnPrioritySchedulingITCase.java
@@ -18,25 +18,19 @@
package org.apache.flink.yarn;
-import org.apache.hadoop.util.VersionInfo;
import org.apache.hadoop.yarn.api.records.ApplicationReport;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import java.lang.reflect.Method;
-import static org.apache.flink.yarn.YarnTestUtils.isHadoopVersionGreaterThanOrEquals;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
/** Tests to Yarn's priority scheduling. */
class YarnPrioritySchedulingITCase extends YarnTestBase {
@BeforeAll
public static void setup() {
- assumeTrue(
- isHadoopVersionGreaterThanOrEquals(2, 8),
- "Priority scheduling is not supported by Hadoop: " + VersionInfo.getVersion());
YARN_CONFIGURATION.setStrings("yarn.cluster.max-application-priority", "10");
startYARNWithConfig(YARN_CONFIGURATION);
diff --git a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnTestBase.java b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnTestBase.java
index f049b54462c..6e25d4378ce 100644
--- a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnTestBase.java
+++ b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnTestBase.java
@@ -29,6 +29,7 @@ import org.apache.flink.util.ExceptionUtils;
import org.apache.flink.util.Preconditions;
import org.apache.flink.util.function.RunnableWithException;
import org.apache.flink.yarn.cli.FlinkYarnSessionCli;
+import org.apache.flink.yarn.configuration.YarnLogConfigUtil;
import org.apache.flink.yarn.util.TestUtils;
import org.apache.commons.io.FileUtils;
@@ -395,11 +396,12 @@ public abstract class YarnTestBase {
YarnClusterDescriptor createYarnClusterDescriptorWithoutLibDir(
org.apache.flink.configuration.Configuration flinkConfiguration) {
final YarnClusterDescriptor yarnClusterDescriptor =
- YarnTestUtils.createClusterDescriptorWithLogging(
- tempConfPathForSecureRun.getAbsolutePath(),
- flinkConfiguration,
+ new YarnClusterDescriptor(
+ YarnLogConfigUtil.setLogConfigFileInConfig(
+ flinkConfiguration, tempConfPathForSecureRun.getAbsolutePath()),
YARN_CONFIGURATION,
yarnClient,
+ YarnClientYarnClusterInformationRetriever.create(yarnClient),
true);
yarnClusterDescriptor.setLocalJarPath(new Path(flinkUberjar.toURI()));
return yarnClusterDescriptor;
diff --git a/flink-yarn/pom.xml b/flink-yarn/pom.xml
index fe12c907419..9d75f629516 100644
--- a/flink-yarn/pom.xml
+++ b/flink-yarn/pom.xml
@@ -214,23 +214,6 @@ under the License.
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- <configuration>
- <excludes>
- <exclude>resource-types.xml</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>