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 2023/11/22 11:09:36 UTC
(flink) branch master updated (2378babf86c -> 7f2818bea1c)
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
from 2378babf86c [FLINK-29452][test] Allow unit tests to be executed individually
new 905d5998093 [FLINK-33311] `surefire.module.config` args should be before entry point classname
new 7f2818bea1c [hotfix] Rename `TestJvmProcess#getJvmArgs` to `TestJvmProcess#getMainMethodArgs`
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../ClusterUncaughtExceptionHandlerITCase.java | 2 +-
.../io/disk/FileChannelManagerImplTest.java | 2 +-
.../flink/runtime/testutils/DispatcherProcess.java | 2 +-
.../flink/runtime/testutils/TestJvmProcess.java | 23 +++++++++++-----------
.../testutils/TestingClusterEntrypointProcess.java | 2 +-
.../flink/runtime/util/BlockingShutdownTest.java | 2 +-
.../runtime/util/FlinkSecurityManagerITCase.java | 2 +-
.../runtime/util/JvmExitOnFatalErrorTest.java | 2 +-
8 files changed, 19 insertions(+), 18 deletions(-)
(flink) 01/02: [FLINK-33311] `surefire.module.config` args should be before entry point classname
Posted by ch...@apache.org.
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
commit 905d5998093127b145c9aa7d32a1667c4b45e850
Author: Sergey Nuyanzin <sn...@gmail.com>
AuthorDate: Fri Nov 3 17:57:49 2023 +0100
[FLINK-33311] `surefire.module.config` args should be before entry point classname
---
.../apache/flink/runtime/testutils/TestJvmProcess.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TestJvmProcess.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TestJvmProcess.java
index 78cebd083f3..c174f66f411 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TestJvmProcess.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TestJvmProcess.java
@@ -141,21 +141,22 @@ public abstract class TestJvmProcess {
"-Xmx" + jvmMemoryInMb + "m",
"-classpath",
getCurrentClasspath(),
- "-XX:+IgnoreUnrecognizedVMOptions",
- getEntryPointClassName()
+ "-XX:+IgnoreUnrecognizedVMOptions"
};
+ final String moduleConfig = System.getProperty("surefire.module.config");
+ if (moduleConfig != null) {
+ cmd = ArrayUtils.addAll(cmd, moduleConfig.trim().split("\\s+"));
+ }
+
+ cmd = ArrayUtils.add(cmd, getEntryPointClassName());
+
String[] jvmArgs = getJvmArgs();
if (jvmArgs != null && jvmArgs.length > 0) {
cmd = ArrayUtils.addAll(cmd, jvmArgs);
}
- final String moduleConfig = System.getProperty("surefire.module.config");
- if (moduleConfig != null) {
- cmd = ArrayUtils.addAll(cmd, moduleConfig.split(" "));
- }
-
synchronized (createDestroyLock) {
checkState(process == null, "process already started");
(flink) 02/02: [hotfix] Rename `TestJvmProcess#getJvmArgs` to `TestJvmProcess#getMainMethodArgs`
Posted by ch...@apache.org.
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
commit 7f2818bea1c50d9a092c5360a3d4de3a86c411b2
Author: Sergey Nuyanzin <sn...@gmail.com>
AuthorDate: Fri Nov 3 18:03:39 2023 +0100
[hotfix] Rename `TestJvmProcess#getJvmArgs` to `TestJvmProcess#getMainMethodArgs`
---
.../entrypoint/ClusterUncaughtExceptionHandlerITCase.java | 2 +-
.../flink/runtime/io/disk/FileChannelManagerImplTest.java | 2 +-
.../org/apache/flink/runtime/testutils/DispatcherProcess.java | 2 +-
.../org/apache/flink/runtime/testutils/TestJvmProcess.java | 10 +++++-----
.../runtime/testutils/TestingClusterEntrypointProcess.java | 2 +-
.../org/apache/flink/runtime/util/BlockingShutdownTest.java | 2 +-
.../apache/flink/runtime/util/FlinkSecurityManagerITCase.java | 2 +-
.../org/apache/flink/runtime/util/JvmExitOnFatalErrorTest.java | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/entrypoint/ClusterUncaughtExceptionHandlerITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/entrypoint/ClusterUncaughtExceptionHandlerITCase.java
index 520c8d32591..ae5178310b2 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/entrypoint/ClusterUncaughtExceptionHandlerITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/entrypoint/ClusterUncaughtExceptionHandlerITCase.java
@@ -130,7 +130,7 @@ public class ClusterUncaughtExceptionHandlerITCase extends TestLogger {
}
@Override
- public String[] getJvmArgs() {
+ public String[] getMainMethodArgs() {
return new String[0];
}
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/FileChannelManagerImplTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/FileChannelManagerImplTest.java
index 17ab746d41a..73b8c565d16 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/FileChannelManagerImplTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/FileChannelManagerImplTest.java
@@ -185,7 +185,7 @@ class FileChannelManagerImplTest {
}
@Override
- public String[] getJvmArgs() {
+ public String[] getMainMethodArgs() {
return new String[] {Boolean.toString(callerHasHook), tmpDirectories, signalFilePath};
}
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/DispatcherProcess.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/DispatcherProcess.java
index 66e7f710546..7f0a247dc21 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/DispatcherProcess.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/DispatcherProcess.java
@@ -78,7 +78,7 @@ public class DispatcherProcess extends TestJvmProcess {
}
@Override
- public String[] getJvmArgs() {
+ public String[] getMainMethodArgs() {
return jvmArgs;
}
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TestJvmProcess.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TestJvmProcess.java
index c174f66f411..e9ca964350e 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TestJvmProcess.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TestJvmProcess.java
@@ -101,12 +101,12 @@ public abstract class TestJvmProcess {
*
* <p>These can be parsed by the main method of the entry point class.
*/
- public abstract String[] getJvmArgs();
+ public abstract String[] getMainMethodArgs();
/**
* Returns the name of the class to run.
*
- * <p>Arguments to the main method can be specified via {@link #getJvmArgs()}.
+ * <p>Arguments to the main method can be specified via {@link #getMainMethodArgs()}.
*/
public abstract String getEntryPointClassName();
@@ -151,10 +151,10 @@ public abstract class TestJvmProcess {
cmd = ArrayUtils.add(cmd, getEntryPointClassName());
- String[] jvmArgs = getJvmArgs();
+ String[] mainMethodArgs = getMainMethodArgs();
- if (jvmArgs != null && jvmArgs.length > 0) {
- cmd = ArrayUtils.addAll(cmd, jvmArgs);
+ if (mainMethodArgs != null && mainMethodArgs.length > 0) {
+ cmd = ArrayUtils.addAll(cmd, mainMethodArgs);
}
synchronized (createDestroyLock) {
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TestingClusterEntrypointProcess.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TestingClusterEntrypointProcess.java
index ef9f674a72d..81dd2043ac9 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TestingClusterEntrypointProcess.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TestingClusterEntrypointProcess.java
@@ -55,7 +55,7 @@ public class TestingClusterEntrypointProcess extends TestJvmProcess {
}
@Override
- public String[] getJvmArgs() {
+ public String[] getMainMethodArgs() {
return new String[] {markerFile.getAbsolutePath()};
}
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/util/BlockingShutdownTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/util/BlockingShutdownTest.java
index d6406ca9c19..d7a69a42dc2 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/util/BlockingShutdownTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/util/BlockingShutdownTest.java
@@ -164,7 +164,7 @@ class BlockingShutdownTest {
}
@Override
- public String[] getJvmArgs() {
+ public String[] getMainMethodArgs() {
return new String[] {
tempFilePath, String.valueOf(installSignalHandler), String.valueOf(selfKillDelay)
};
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/util/FlinkSecurityManagerITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/util/FlinkSecurityManagerITCase.java
index 35c5d114ea8..d46727b2d29 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/util/FlinkSecurityManagerITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/util/FlinkSecurityManagerITCase.java
@@ -82,7 +82,7 @@ class FlinkSecurityManagerITCase {
}
@Override
- public String[] getJvmArgs() {
+ public String[] getMainMethodArgs() {
return new String[0];
}
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/util/JvmExitOnFatalErrorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/util/JvmExitOnFatalErrorTest.java
index 7f0dd21d6b5..ac3be460a78 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/util/JvmExitOnFatalErrorTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/util/JvmExitOnFatalErrorTest.java
@@ -131,7 +131,7 @@ class JvmExitOnFatalErrorTest {
}
@Override
- public String[] getJvmArgs() {
+ public String[] getMainMethodArgs() {
return new String[] {temporaryFolder.getAbsolutePath()};
}