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/04/20 20:30:55 UTC
[flink] 02/02: [FLINK-27287][tests] Use random ports
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch release-1.15
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 4fad1212e30074a8786213793224ca4b0ffcc401
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Tue Apr 19 12:26:23 2022 +0200
[FLINK-27287][tests] Use random ports
---
.../file/sink/FileSinkCompactionSwitchITCase.java | 5 +--
.../flink/connector/file/sink/FileSinkITBase.java | 6 +---
.../file/sink/writer/FileSinkMigrationITCase.java | 6 +---
.../formats/avro/AvroExternalJarProgramITCase.java | 1 +
.../minicluster/MiniClusterConfiguration.java | 15 ++++++++
.../FileExecutionGraphInfoStoreTest.java | 3 +-
.../MemoryExecutionGraphInfoStoreTest.java | 1 +
.../network/partition/FileBufferReaderITCase.java | 3 +-
.../runtime/minicluster/MiniClusterITCase.java | 41 +++++++++-------------
.../flink/runtime/shuffle/ShuffleMasterTest.java | 3 +-
.../OperatorEventSendingCheckpointITCase.java | 1 +
.../DefaultSchedulerLocalRecoveryITCase.java | 4 +--
.../flink/test/runtime/JobGraphRunningUtil.java | 3 +-
.../flink/test/runtime/SchedulingITCase.java | 4 +--
.../PipelinedRegionSchedulingITCase.java | 3 +-
15 files changed, 46 insertions(+), 53 deletions(-)
diff --git a/flink-connectors/flink-connector-files/src/test/java/org/apache/flink/connector/file/sink/FileSinkCompactionSwitchITCase.java b/flink-connectors/flink-connector-files/src/test/java/org/apache/flink/connector/file/sink/FileSinkCompactionSwitchITCase.java
index d4a68ca648c..aa49b72146f 100644
--- a/flink-connectors/flink-connector-files/src/test/java/org/apache/flink/connector/file/sink/FileSinkCompactionSwitchITCase.java
+++ b/flink-connectors/flink-connector-files/src/test/java/org/apache/flink/connector/file/sink/FileSinkCompactionSwitchITCase.java
@@ -24,7 +24,6 @@ import org.apache.flink.api.common.state.ListState;
import org.apache.flink.api.common.state.ListStateDescriptor;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.ExecutionOptions;
-import org.apache.flink.configuration.RestOptions;
import org.apache.flink.configuration.StateChangelogOptions;
import org.apache.flink.connector.file.sink.FileSink.DefaultRowFormatBuilder;
import org.apache.flink.connector.file.sink.compactor.DecoderBasedReader;
@@ -178,13 +177,11 @@ public class FileSinkCompactionSwitchITCase extends TestLogger {
JobGraph jobGraph = createJobGraph(cpPath, originFileSink, false, sendCountMap);
JobGraph restoringJobGraph = createJobGraph(cpPath, restoredFileSink, true, sendCountMap);
- final Configuration config = new Configuration();
- config.setString(RestOptions.BIND_PORT, "18081-19000");
final MiniClusterConfiguration cfg =
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setNumTaskManagers(1)
.setNumSlotsPerTaskManager(4)
- .setConfiguration(config)
.build();
try (MiniCluster miniCluster = new MiniCluster(cfg)) {
diff --git a/flink-connectors/flink-connector-files/src/test/java/org/apache/flink/connector/file/sink/FileSinkITBase.java b/flink-connectors/flink-connector-files/src/test/java/org/apache/flink/connector/file/sink/FileSinkITBase.java
index de8de90eb22..7577df750d5 100644
--- a/flink-connectors/flink-connector-files/src/test/java/org/apache/flink/connector/file/sink/FileSinkITBase.java
+++ b/flink-connectors/flink-connector-files/src/test/java/org/apache/flink/connector/file/sink/FileSinkITBase.java
@@ -18,8 +18,6 @@
package org.apache.flink.connector.file.sink;
-import org.apache.flink.configuration.Configuration;
-import org.apache.flink.configuration.RestOptions;
import org.apache.flink.connector.file.sink.utils.IntegerFileSinkTestDataUtils;
import org.apache.flink.connector.file.sink.utils.PartSizeAndCheckpointRollingPolicy;
import org.apache.flink.core.fs.Path;
@@ -64,13 +62,11 @@ public abstract class FileSinkITBase extends TestLogger {
JobGraph jobGraph = createJobGraph(path);
- final Configuration config = new Configuration();
- config.setString(RestOptions.BIND_PORT, "18081-19000");
final MiniClusterConfiguration cfg =
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setNumTaskManagers(1)
.setNumSlotsPerTaskManager(4)
- .setConfiguration(config)
.build();
try (MiniCluster miniCluster = new MiniCluster(cfg)) {
diff --git a/flink-connectors/flink-connector-files/src/test/java/org/apache/flink/connector/file/sink/writer/FileSinkMigrationITCase.java b/flink-connectors/flink-connector-files/src/test/java/org/apache/flink/connector/file/sink/writer/FileSinkMigrationITCase.java
index 75822f4225c..f7184a441ae 100644
--- a/flink-connectors/flink-connector-files/src/test/java/org/apache/flink/connector/file/sink/writer/FileSinkMigrationITCase.java
+++ b/flink-connectors/flink-connector-files/src/test/java/org/apache/flink/connector/file/sink/writer/FileSinkMigrationITCase.java
@@ -23,8 +23,6 @@ import org.apache.flink.api.common.JobSubmissionResult;
import org.apache.flink.api.common.state.CheckpointListener;
import org.apache.flink.api.common.state.ListState;
import org.apache.flink.api.common.state.ListStateDescriptor;
-import org.apache.flink.configuration.Configuration;
-import org.apache.flink.configuration.RestOptions;
import org.apache.flink.connector.file.sink.FileSink;
import org.apache.flink.connector.file.sink.utils.IntegerFileSinkTestDataUtils;
import org.apache.flink.core.execution.SavepointFormatType;
@@ -115,13 +113,11 @@ public class FileSinkMigrationITCase extends TestLogger {
String outputPath = TEMPORARY_FOLDER.newFolder().getAbsolutePath();
String savepointBasePath = TEMPORARY_FOLDER.newFolder().getAbsolutePath();
- final Configuration config = new Configuration();
- config.setString(RestOptions.BIND_PORT, "18081-19000");
final MiniClusterConfiguration cfg =
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setNumTaskManagers(1)
.setNumSlotsPerTaskManager(4)
- .setConfiguration(config)
.build();
JobGraph streamingFileSinkJobGraph = createStreamingFileSinkJobGraph(outputPath);
diff --git a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/AvroExternalJarProgramITCase.java b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/AvroExternalJarProgramITCase.java
index 39a44e790c3..4cdee50a872 100644
--- a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/AvroExternalJarProgramITCase.java
+++ b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/AvroExternalJarProgramITCase.java
@@ -46,6 +46,7 @@ class AvroExternalJarProgramITCase {
private static final MiniCluster MINI_CLUSTER =
new MiniCluster(
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setNumTaskManagers(1)
.setNumSlotsPerTaskManager(PARALLELISM)
.build());
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniClusterConfiguration.java b/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniClusterConfiguration.java
index 980c0a84b5f..51be3944f3c 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniClusterConfiguration.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniClusterConfiguration.java
@@ -175,6 +175,7 @@ public class MiniClusterConfiguration {
private RpcServiceSharing rpcServiceSharing = SHARED;
@Nullable private String commonBindAddress = null;
private MiniCluster.HaServices haServices = MiniCluster.HaServices.CONFIGURED;
+ private boolean useRandomPorts = false;
public Builder setConfiguration(Configuration configuration1) {
this.configuration = Preconditions.checkNotNull(configuration1);
@@ -206,6 +207,11 @@ public class MiniClusterConfiguration {
return this;
}
+ public Builder withRandomPorts() {
+ this.useRandomPorts = true;
+ return this;
+ }
+
public MiniClusterConfiguration build() {
final Configuration modifiedConfiguration = new Configuration(configuration);
modifiedConfiguration.setInteger(
@@ -214,6 +220,15 @@ public class MiniClusterConfiguration {
RestOptions.ADDRESS,
modifiedConfiguration.getString(RestOptions.ADDRESS, "localhost"));
+ if (useRandomPorts) {
+ if (!configuration.contains(JobManagerOptions.PORT)) {
+ modifiedConfiguration.set(JobManagerOptions.PORT, 0);
+ }
+ if (!configuration.contains(RestOptions.BIND_PORT)) {
+ modifiedConfiguration.setString(RestOptions.BIND_PORT, "0");
+ }
+ }
+
return new MiniClusterConfiguration(
modifiedConfiguration,
numTaskManagers,
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/FileExecutionGraphInfoStoreTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/FileExecutionGraphInfoStoreTest.java
index 38d4e46ee9d..9972adfe284 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/FileExecutionGraphInfoStoreTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/FileExecutionGraphInfoStoreTest.java
@@ -324,7 +324,8 @@ public class FileExecutionGraphInfoStoreTest extends TestLogger {
File rootDir = temporaryFolder.newFolder();
try (final MiniCluster miniCluster =
new ExecutionGraphInfoStoreTestUtils.PersistingMiniCluster(
- new MiniClusterConfiguration.Builder().build(), rootDir)) {
+ new MiniClusterConfiguration.Builder().withRandomPorts().build(),
+ rootDir)) {
miniCluster.start();
final JobVertex vertex = new JobVertex("blockingVertex");
// The adaptive scheduler expects that every vertex has a configured parallelism
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/MemoryExecutionGraphInfoStoreTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/MemoryExecutionGraphInfoStoreTest.java
index b7f3187d132..be1d09342a1 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/MemoryExecutionGraphInfoStoreTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/MemoryExecutionGraphInfoStoreTest.java
@@ -240,6 +240,7 @@ public class MemoryExecutionGraphInfoStoreTest extends TestLogger {
try (final MiniCluster miniCluster =
new ExecutionGraphInfoStoreTestUtils.PersistingMiniCluster(
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setConfiguration(configuration)
.build())) {
miniCluster.start();
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/FileBufferReaderITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/FileBufferReaderITCase.java
index ab18aa5f55c..137aecf1bab 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/FileBufferReaderITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/FileBufferReaderITCase.java
@@ -21,7 +21,6 @@ package org.apache.flink.runtime.io.network.partition;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.MemorySize;
import org.apache.flink.configuration.NettyShuffleEnvironmentOptions;
-import org.apache.flink.configuration.RestOptions;
import org.apache.flink.configuration.SecurityOptions;
import org.apache.flink.configuration.TaskManagerOptions;
import org.apache.flink.runtime.execution.Environment;
@@ -111,7 +110,6 @@ public class FileBufferReaderITCase extends TestLogger {
// if the netty server thread could not response in time, like when it is
// busy reading the files.
configuration.setInteger(SecurityOptions.SSL_INTERNAL_HANDSHAKE_TIMEOUT, 100000);
- configuration.setString(RestOptions.BIND_PORT, "0");
configuration.setString(
NettyShuffleEnvironmentOptions.NETWORK_BLOCKING_SHUFFLE_TYPE, "file");
configuration.set(TaskManagerOptions.TOTAL_FLINK_MEMORY, MemorySize.parse("1g"));
@@ -120,6 +118,7 @@ public class FileBufferReaderITCase extends TestLogger {
final MiniClusterConfiguration miniClusterConfiguration =
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setConfiguration(configuration)
.setNumTaskManagers(parallelism)
.setNumSlotsPerTaskManager(1)
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/minicluster/MiniClusterITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/minicluster/MiniClusterITCase.java
index 64dad6982df..4efc67785f8 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/minicluster/MiniClusterITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/minicluster/MiniClusterITCase.java
@@ -23,7 +23,6 @@ import org.apache.flink.api.common.JobSubmissionResult;
import org.apache.flink.api.common.restartstrategy.RestartStrategies;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.JobManagerOptions;
-import org.apache.flink.configuration.RestOptions;
import org.apache.flink.core.testutils.FlinkMatchers;
import org.apache.flink.runtime.client.JobExecutionException;
import org.apache.flink.runtime.io.network.partition.ResultPartitionType;
@@ -73,10 +72,10 @@ public class MiniClusterITCase extends TestLogger {
final MiniClusterConfiguration cfg =
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setNumTaskManagers(numOfTMs)
.setNumSlotsPerTaskManager(slotsPerTM)
.setRpcServiceSharing(RpcServiceSharing.SHARED)
- .setConfiguration(getDefaultConfiguration())
.build();
try (final MiniCluster miniCluster = new MiniCluster(cfg)) {
@@ -93,10 +92,10 @@ public class MiniClusterITCase extends TestLogger {
final MiniClusterConfiguration cfg =
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setNumTaskManagers(numOfTMs)
.setNumSlotsPerTaskManager(slotsPerTM)
.setRpcServiceSharing(RpcServiceSharing.DEDICATED)
- .setConfiguration(getDefaultConfiguration())
.build();
try (final MiniCluster miniCluster = new MiniCluster(cfg)) {
@@ -134,7 +133,7 @@ public class MiniClusterITCase extends TestLogger {
}
private void runHandleJobsWhenNotEnoughSlots(final JobGraph jobGraph) throws Exception {
- final Configuration configuration = getDefaultConfiguration();
+ final Configuration configuration = new Configuration();
// this triggers the failure for the default scheduler
configuration.setLong(JobManagerOptions.SLOT_REQUEST_TIMEOUT, 100L);
// this triggers the failure for the adaptive scheduler
@@ -142,6 +141,7 @@ public class MiniClusterITCase extends TestLogger {
final MiniClusterConfiguration cfg =
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setNumTaskManagers(1)
.setNumSlotsPerTaskManager(1)
.setConfiguration(configuration)
@@ -160,9 +160,9 @@ public class MiniClusterITCase extends TestLogger {
final MiniClusterConfiguration cfg =
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setNumTaskManagers(1)
.setNumSlotsPerTaskManager(2 * parallelism)
- .setConfiguration(getDefaultConfiguration())
.build();
try (final MiniCluster miniCluster = new MiniCluster(cfg)) {
@@ -191,9 +191,9 @@ public class MiniClusterITCase extends TestLogger {
final MiniClusterConfiguration cfg =
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setNumTaskManagers(1)
.setNumSlotsPerTaskManager(2 * parallelism)
- .setConfiguration(getDefaultConfiguration())
.build();
try (final MiniCluster miniCluster = new MiniCluster(cfg)) {
@@ -222,9 +222,9 @@ public class MiniClusterITCase extends TestLogger {
final MiniClusterConfiguration cfg =
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setNumTaskManagers(1)
.setNumSlotsPerTaskManager(6 * parallelism)
- .setConfiguration(getDefaultConfiguration())
.build();
try (final MiniCluster miniCluster = new MiniCluster(cfg)) {
@@ -267,9 +267,9 @@ public class MiniClusterITCase extends TestLogger {
final MiniClusterConfiguration cfg =
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setNumTaskManagers(1)
.setNumSlotsPerTaskManager(6 * parallelism)
- .setConfiguration(getDefaultConfiguration())
.build();
try (final MiniCluster miniCluster = new MiniCluster(cfg)) {
@@ -305,9 +305,9 @@ public class MiniClusterITCase extends TestLogger {
final MiniClusterConfiguration cfg =
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setNumTaskManagers(1)
.setNumSlotsPerTaskManager(parallelism)
- .setConfiguration(getDefaultConfiguration())
.build();
try (final MiniCluster miniCluster = new MiniCluster(cfg)) {
@@ -348,9 +348,9 @@ public class MiniClusterITCase extends TestLogger {
final MiniClusterConfiguration cfg =
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setNumTaskManagers(1)
.setNumSlotsPerTaskManager(2 * parallelism)
- .setConfiguration(getDefaultConfiguration())
.build();
try (final MiniCluster miniCluster = new MiniCluster(cfg)) {
@@ -386,9 +386,9 @@ public class MiniClusterITCase extends TestLogger {
final MiniClusterConfiguration cfg =
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setNumTaskManagers(1)
.setNumSlotsPerTaskManager(parallelism)
- .setConfiguration(getDefaultConfiguration())
.build();
try (final MiniCluster miniCluster = new MiniCluster(cfg)) {
@@ -434,9 +434,9 @@ public class MiniClusterITCase extends TestLogger {
final MiniClusterConfiguration cfg =
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setNumTaskManagers(1)
.setNumSlotsPerTaskManager(2 * parallelism)
- .setConfiguration(getDefaultConfiguration())
.build();
try (final MiniCluster miniCluster = new MiniCluster(cfg)) {
@@ -472,9 +472,9 @@ public class MiniClusterITCase extends TestLogger {
final MiniClusterConfiguration cfg =
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setNumTaskManagers(1)
.setNumSlotsPerTaskManager(2 * parallelism)
- .setConfiguration(getDefaultConfiguration())
.build();
try (final MiniCluster miniCluster = new MiniCluster(cfg)) {
@@ -511,9 +511,9 @@ public class MiniClusterITCase extends TestLogger {
final MiniClusterConfiguration cfg =
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setNumTaskManagers(1)
.setNumSlotsPerTaskManager(parallelism)
- .setConfiguration(getDefaultConfiguration())
.build();
try (final MiniCluster miniCluster = new MiniCluster(cfg)) {
@@ -560,9 +560,9 @@ public class MiniClusterITCase extends TestLogger {
final MiniClusterConfiguration cfg =
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setNumTaskManagers(1)
.setNumSlotsPerTaskManager(2 * parallelism)
- .setConfiguration(getDefaultConfiguration())
.build();
try (final MiniCluster miniCluster = new MiniCluster(cfg)) {
@@ -603,9 +603,9 @@ public class MiniClusterITCase extends TestLogger {
final MiniClusterConfiguration cfg =
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setNumTaskManagers(1)
.setNumSlotsPerTaskManager(parallelism)
- .setConfiguration(getDefaultConfiguration())
.build();
try (final MiniCluster miniCluster = new MiniCluster(cfg)) {
@@ -645,9 +645,9 @@ public class MiniClusterITCase extends TestLogger {
final MiniClusterConfiguration cfg =
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setNumTaskManagers(1)
.setNumSlotsPerTaskManager(parallelism)
- .setConfiguration(getDefaultConfiguration())
.build();
try (final MiniCluster miniCluster = new MiniCluster(cfg)) {
@@ -683,13 +683,6 @@ public class MiniClusterITCase extends TestLogger {
// Utilities
// ------------------------------------------------------------------------
- private Configuration getDefaultConfiguration() {
- final Configuration configuration = new Configuration();
- configuration.setString(RestOptions.BIND_PORT, "0");
-
- return configuration;
- }
-
private static JobGraph getSimpleJob(int parallelism) throws IOException {
final JobVertex task = new JobVertex("Test task");
task.setParallelism(parallelism);
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/shuffle/ShuffleMasterTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/shuffle/ShuffleMasterTest.java
index 615a290cbc9..0cf23b71108 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/shuffle/ShuffleMasterTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/shuffle/ShuffleMasterTest.java
@@ -22,7 +22,6 @@ import org.apache.flink.api.common.ExecutionConfig;
import org.apache.flink.api.common.JobID;
import org.apache.flink.api.common.time.Time;
import org.apache.flink.configuration.Configuration;
-import org.apache.flink.configuration.RestOptions;
import org.apache.flink.runtime.io.network.NettyShuffleServiceFactory;
import org.apache.flink.runtime.io.network.partition.ResultPartitionID;
import org.apache.flink.runtime.io.network.partition.ResultPartitionType;
@@ -108,9 +107,9 @@ public class ShuffleMasterTest extends TestLogger {
configuration.setString(
ShuffleServiceOptions.SHUFFLE_SERVICE_FACTORY_CLASS,
TestShuffleServiceFactory.class.getName());
- configuration.setString(RestOptions.BIND_PORT, "0");
configuration.setBoolean(STOP_TRACKING_PARTITION_KEY, stopTrackingPartition);
return new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setNumTaskManagers(1)
.setNumSlotsPerTaskManager(1)
.setConfiguration(configuration)
diff --git a/flink-tests/src/test/java/org/apache/flink/runtime/operators/coordination/OperatorEventSendingCheckpointITCase.java b/flink-tests/src/test/java/org/apache/flink/runtime/operators/coordination/OperatorEventSendingCheckpointITCase.java
index 3733d433f30..936d2eccf27 100644
--- a/flink-tests/src/test/java/org/apache/flink/runtime/operators/coordination/OperatorEventSendingCheckpointITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/runtime/operators/coordination/OperatorEventSendingCheckpointITCase.java
@@ -555,6 +555,7 @@ public class OperatorEventSendingCheckpointITCase extends TestLogger {
final int numSlots, final Configuration configuration) {
super(
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setRpcServiceSharing(RpcServiceSharing.SHARED)
.setNumTaskManagers(1)
.setConfiguration(configuration)
diff --git a/flink-tests/src/test/java/org/apache/flink/test/runtime/DefaultSchedulerLocalRecoveryITCase.java b/flink-tests/src/test/java/org/apache/flink/test/runtime/DefaultSchedulerLocalRecoveryITCase.java
index 0bcccecaaa8..0e1fab108f6 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/runtime/DefaultSchedulerLocalRecoveryITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/runtime/DefaultSchedulerLocalRecoveryITCase.java
@@ -26,7 +26,6 @@ import org.apache.flink.configuration.CheckpointingOptions;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.JobManagerOptions;
import org.apache.flink.configuration.MemorySize;
-import org.apache.flink.configuration.RestOptions;
import org.apache.flink.configuration.TaskManagerOptions;
import org.apache.flink.runtime.clusterframework.types.AllocationID;
import org.apache.flink.runtime.executiongraph.ArchivedExecutionGraph;
@@ -107,8 +106,6 @@ public class DefaultSchedulerLocalRecoveryITCase extends TestLogger {
private ArchivedExecutionGraph executeSchedulingTest(
Configuration configuration, int parallelism) throws Exception {
- configuration.setString(RestOptions.BIND_PORT, "0");
-
final long slotIdleTimeout = TIMEOUT;
configuration.setLong(JobManagerOptions.SLOT_IDLE_TIMEOUT, slotIdleTimeout);
@@ -118,6 +115,7 @@ public class DefaultSchedulerLocalRecoveryITCase extends TestLogger {
final MiniClusterConfiguration miniClusterConfiguration =
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setConfiguration(configuration)
.setNumTaskManagers(parallelism)
.setNumSlotsPerTaskManager(1)
diff --git a/flink-tests/src/test/java/org/apache/flink/test/runtime/JobGraphRunningUtil.java b/flink-tests/src/test/java/org/apache/flink/test/runtime/JobGraphRunningUtil.java
index 360126c4d02..aa7f392b724 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/runtime/JobGraphRunningUtil.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/runtime/JobGraphRunningUtil.java
@@ -22,7 +22,6 @@ import org.apache.flink.api.common.JobID;
import org.apache.flink.client.program.MiniClusterClient;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.MemorySize;
-import org.apache.flink.configuration.RestOptions;
import org.apache.flink.configuration.TaskManagerOptions;
import org.apache.flink.runtime.jobgraph.JobGraph;
import org.apache.flink.runtime.jobmaster.JobResult;
@@ -39,10 +38,10 @@ public class JobGraphRunningUtil {
int numSlotsPerTaskManager)
throws Exception {
configuration.set(TaskManagerOptions.TOTAL_FLINK_MEMORY, MemorySize.parse("1g"));
- configuration.setString(RestOptions.BIND_PORT, "0");
final MiniClusterConfiguration miniClusterConfiguration =
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setConfiguration(configuration)
.setNumTaskManagers(numTaskManagers)
.setNumSlotsPerTaskManager(numSlotsPerTaskManager)
diff --git a/flink-tests/src/test/java/org/apache/flink/test/runtime/SchedulingITCase.java b/flink-tests/src/test/java/org/apache/flink/test/runtime/SchedulingITCase.java
index 168b5f97aad..5ac299cb997 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/runtime/SchedulingITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/runtime/SchedulingITCase.java
@@ -26,7 +26,6 @@ import org.apache.flink.configuration.CheckpointingOptions;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.JobManagerOptions;
import org.apache.flink.configuration.MemorySize;
-import org.apache.flink.configuration.RestOptions;
import org.apache.flink.configuration.TaskManagerOptions;
import org.apache.flink.runtime.execution.Environment;
import org.apache.flink.runtime.io.network.partition.ResultPartitionType;
@@ -95,8 +94,6 @@ public class SchedulingITCase extends TestLogger {
}
private void executeSchedulingTest(Configuration configuration) throws Exception {
- configuration.setString(RestOptions.BIND_PORT, "0");
-
final long slotIdleTimeout = 50L;
configuration.setLong(JobManagerOptions.SLOT_IDLE_TIMEOUT, slotIdleTimeout);
@@ -105,6 +102,7 @@ public class SchedulingITCase extends TestLogger {
final int parallelism = 4;
final MiniClusterConfiguration miniClusterConfiguration =
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setConfiguration(configuration)
.setNumTaskManagers(parallelism)
.setNumSlotsPerTaskManager(1)
diff --git a/flink-tests/src/test/java/org/apache/flink/test/scheduling/PipelinedRegionSchedulingITCase.java b/flink-tests/src/test/java/org/apache/flink/test/scheduling/PipelinedRegionSchedulingITCase.java
index 959a5dfeb86..2df030df772 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/scheduling/PipelinedRegionSchedulingITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/scheduling/PipelinedRegionSchedulingITCase.java
@@ -22,7 +22,6 @@ import org.apache.flink.api.common.JobID;
import org.apache.flink.client.program.MiniClusterClient;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.JobManagerOptions;
-import org.apache.flink.configuration.RestOptions;
import org.apache.flink.configuration.RestartStrategyOptions;
import org.apache.flink.runtime.execution.Environment;
import org.apache.flink.runtime.io.network.api.reader.RecordReader;
@@ -105,11 +104,11 @@ public class PipelinedRegionSchedulingITCase extends TestLogger {
private JobResult executeSchedulingTest(
JobGraph jobGraph, int numSlots, Configuration configuration) throws Exception {
- configuration.setString(RestOptions.BIND_PORT, "0");
configuration.setLong(JobManagerOptions.SLOT_REQUEST_TIMEOUT, 5000L);
final MiniClusterConfiguration miniClusterConfiguration =
new MiniClusterConfiguration.Builder()
+ .withRandomPorts()
.setConfiguration(configuration)
.setNumTaskManagers(1)
.setNumSlotsPerTaskManager(numSlots)