You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2018/06/22 15:45:35 UTC
[2/9] flink git commit: [hotfix] Start always ClusterClient for
MiniClusterResource
[hotfix] Start always ClusterClient for MiniClusterResource
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/029b9c06
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/029b9c06
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/029b9c06
Branch: refs/heads/master
Commit: 029b9c060ca5b3af03846a06c51d26913564b1f4
Parents: ccfe9bb
Author: Till Rohrmann <tr...@apache.org>
Authored: Thu Jun 21 15:15:51 2018 +0200
Committer: Till Rohrmann <tr...@apache.org>
Committed: Fri Jun 22 17:45:04 2018 +0200
----------------------------------------------------------------------
.../connectors/kafka/KafkaTestBase.java | 3 +-
.../gateway/local/LocalExecutorITCase.java | 3 +-
.../jobmanager/JMXJobManagerMetricTest.java | 3 +-
.../HAQueryableStateFsBackendITCase.java | 3 +-
.../HAQueryableStateRocksDBBackendITCase.java | 3 +-
.../NonHAQueryableStateFsBackendITCase.java | 3 +-
...NonHAQueryableStateRocksDBBackendITCase.java | 3 +-
.../runtime/webmonitor/WebFrontendITCase.java | 4 +-
.../runtime/minicluster/FlinkMiniCluster.scala | 7 +++
.../flink/test/util/MiniClusterResource.java | 46 +++++++++++---------
.../accumulators/AccumulatorLiveITCase.java | 3 +-
.../test/cancelling/CancelingTestBase.java | 3 +-
.../test/checkpointing/RescalingITCase.java | 3 +-
.../ResumeCheckpointManuallyITCase.java | 3 +-
.../test/checkpointing/SavepointITCase.java | 15 +++----
.../ZooKeeperHighAvailabilityITCase.java | 3 +-
.../utils/SavepointMigrationTestBase.java | 3 +-
.../failing/JobSubmissionFailsITCase.java | 3 +-
.../flink/test/runtime/NettyEpollITCase.java | 3 +-
.../runtime/NetworkStackThroughputITCase.java | 4 +-
.../AbstractOperatorRestoreTestBase.java | 3 +-
.../test/streaming/runtime/TimestampITCase.java | 3 +-
22 files changed, 56 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/029b9c06/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestBase.java
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestBase.java b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestBase.java
index 806c90c..ae77b6f 100644
--- a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestBase.java
+++ b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestBase.java
@@ -86,8 +86,7 @@ public abstract class KafkaTestBase extends TestLogger {
.setConfiguration(getFlinkConfiguration())
.setNumberTaskManagers(NUM_TMS)
.setNumberSlotsPerTaskManager(TM_SLOTS)
- .build(),
- true);
+ .build());
protected static FiniteDuration timeout = new FiniteDuration(10, TimeUnit.SECONDS);
http://git-wip-us.apache.org/repos/asf/flink/blob/029b9c06/flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/LocalExecutorITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/LocalExecutorITCase.java b/flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/LocalExecutorITCase.java
index ad2d509..c4f282b 100644
--- a/flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/LocalExecutorITCase.java
+++ b/flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/LocalExecutorITCase.java
@@ -76,8 +76,7 @@ public class LocalExecutorITCase extends TestLogger {
.setConfiguration(getConfig())
.setNumberTaskManagers(NUM_TMS)
.setNumberSlotsPerTaskManager(NUM_SLOTS_PER_TM)
- .build(),
- true);
+ .build());
private static ClusterClient<?> clusterClient;
http://git-wip-us.apache.org/repos/asf/flink/blob/029b9c06/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/runtime/jobmanager/JMXJobManagerMetricTest.java
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/runtime/jobmanager/JMXJobManagerMetricTest.java b/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/runtime/jobmanager/JMXJobManagerMetricTest.java
index b7afca9..179cf9c 100644
--- a/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/runtime/jobmanager/JMXJobManagerMetricTest.java
+++ b/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/runtime/jobmanager/JMXJobManagerMetricTest.java
@@ -67,8 +67,7 @@ public class JMXJobManagerMetricTest extends TestLogger {
.setConfiguration(getConfiguration())
.setNumberSlotsPerTaskManager(1)
.setNumberTaskManagers(1)
- .build(),
- true);
+ .build());
private static Configuration getConfiguration() {
Configuration flinkConfiguration = new Configuration();
http://git-wip-us.apache.org/repos/asf/flink/blob/029b9c06/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/HAQueryableStateFsBackendITCase.java
----------------------------------------------------------------------
diff --git a/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/HAQueryableStateFsBackendITCase.java b/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/HAQueryableStateFsBackendITCase.java
index f977a8e..63feeaf 100644
--- a/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/HAQueryableStateFsBackendITCase.java
+++ b/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/HAQueryableStateFsBackendITCase.java
@@ -73,8 +73,7 @@ public class HAQueryableStateFsBackendITCase extends AbstractQueryableStateTestB
.setConfiguration(getConfig())
.setNumberTaskManagers(NUM_TMS)
.setNumberSlotsPerTaskManager(NUM_SLOTS_PER_TM)
- .build(),
- true);
+ .build());
miniClusterResource.before();
http://git-wip-us.apache.org/repos/asf/flink/blob/029b9c06/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/HAQueryableStateRocksDBBackendITCase.java
----------------------------------------------------------------------
diff --git a/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/HAQueryableStateRocksDBBackendITCase.java b/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/HAQueryableStateRocksDBBackendITCase.java
index 25f56d7..702e712 100644
--- a/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/HAQueryableStateRocksDBBackendITCase.java
+++ b/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/HAQueryableStateRocksDBBackendITCase.java
@@ -73,8 +73,7 @@ public class HAQueryableStateRocksDBBackendITCase extends AbstractQueryableState
.setConfiguration(getConfig())
.setNumberTaskManagers(NUM_TMS)
.setNumberSlotsPerTaskManager(NUM_SLOTS_PER_TM)
- .build(),
- true);
+ .build());
miniClusterResource.before();
http://git-wip-us.apache.org/repos/asf/flink/blob/029b9c06/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/NonHAQueryableStateFsBackendITCase.java
----------------------------------------------------------------------
diff --git a/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/NonHAQueryableStateFsBackendITCase.java b/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/NonHAQueryableStateFsBackendITCase.java
index 0d61e0d..b166002 100644
--- a/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/NonHAQueryableStateFsBackendITCase.java
+++ b/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/NonHAQueryableStateFsBackendITCase.java
@@ -57,8 +57,7 @@ public class NonHAQueryableStateFsBackendITCase extends AbstractQueryableStateTe
.setConfiguration(getConfig())
.setNumberTaskManagers(NUM_TMS)
.setNumberSlotsPerTaskManager(NUM_SLOTS_PER_TM)
- .build(),
- true);
+ .build());
@Override
protected AbstractStateBackend createStateBackend() throws Exception {
http://git-wip-us.apache.org/repos/asf/flink/blob/029b9c06/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/NonHAQueryableStateRocksDBBackendITCase.java
----------------------------------------------------------------------
diff --git a/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/NonHAQueryableStateRocksDBBackendITCase.java b/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/NonHAQueryableStateRocksDBBackendITCase.java
index 002ff9f..dedf8b1 100644
--- a/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/NonHAQueryableStateRocksDBBackendITCase.java
+++ b/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/NonHAQueryableStateRocksDBBackendITCase.java
@@ -57,8 +57,7 @@ public class NonHAQueryableStateRocksDBBackendITCase extends AbstractQueryableSt
.setConfiguration(getConfig())
.setNumberTaskManagers(NUM_TMS)
.setNumberSlotsPerTaskManager(NUM_SLOTS_PER_TM)
- .build(),
- true);
+ .build());
@Override
protected AbstractStateBackend createStateBackend() throws Exception {
http://git-wip-us.apache.org/repos/asf/flink/blob/029b9c06/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebFrontendITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebFrontendITCase.java b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebFrontendITCase.java
index c20a44e..380ab96 100644
--- a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebFrontendITCase.java
+++ b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebFrontendITCase.java
@@ -84,9 +84,7 @@ public class WebFrontendITCase extends TestLogger {
.setConfiguration(CLUSTER_CONFIGURATION)
.setNumberTaskManagers(NUM_TASK_MANAGERS)
.setNumberSlotsPerTaskManager(NUM_SLOTS)
- .build(),
- true
- );
+ .build());
private static Configuration getClusterConfiguration() {
Configuration config = new Configuration();
http://git-wip-us.apache.org/repos/asf/flink/blob/029b9c06/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/FlinkMiniCluster.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/FlinkMiniCluster.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/FlinkMiniCluster.scala
index 6c9ee5b..8d9e1ee 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/FlinkMiniCluster.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/FlinkMiniCluster.scala
@@ -448,6 +448,13 @@ abstract class FlinkMiniCluster(
ioExecutor)
}
+ def firstActorSystem(): Option[ActorSystem] = {
+ jobManagerActorSystems match {
+ case Some(jmActorSystems) => Some(jmActorSystems.head)
+ case None => None
+ }
+ }
+
protected def startInternalShutdown(): Unit = {
webMonitor foreach {
_.stop()
http://git-wip-us.apache.org/repos/asf/flink/blob/029b9c06/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/MiniClusterResource.java
----------------------------------------------------------------------
diff --git a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/MiniClusterResource.java b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/MiniClusterResource.java
index 150d956..94842a6 100644
--- a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/MiniClusterResource.java
+++ b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/MiniClusterResource.java
@@ -19,6 +19,7 @@
package org.apache.flink.test.util;
import org.apache.flink.client.program.ClusterClient;
+import org.apache.flink.client.program.DefaultActorSystemLoader;
import org.apache.flink.client.program.MiniClusterClient;
import org.apache.flink.client.program.StandaloneClusterClient;
import org.apache.flink.configuration.ConfigConstants;
@@ -32,11 +33,13 @@ import org.apache.flink.runtime.minicluster.JobExecutorService;
import org.apache.flink.runtime.minicluster.LocalFlinkMiniCluster;
import org.apache.flink.runtime.minicluster.MiniCluster;
import org.apache.flink.runtime.minicluster.MiniClusterConfiguration;
+import org.apache.flink.runtime.minicluster.RpcServiceSharing;
import org.apache.flink.streaming.util.TestStreamEnvironment;
import org.apache.flink.util.ExceptionUtils;
import org.apache.flink.util.FlinkRuntimeException;
import org.apache.flink.util.Preconditions;
+import akka.actor.ActorSystem;
import org.junit.Assume;
import org.junit.rules.ExternalResource;
import org.junit.rules.TemporaryFolder;
@@ -46,6 +49,8 @@ import org.slf4j.LoggerFactory;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
+import scala.Option;
+
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
@@ -65,8 +70,6 @@ public class MiniClusterResource extends ExternalResource {
private JobExecutorService jobExecutorService;
- private final boolean enableClusterClient;
-
private ClusterClient<?> clusterClient;
private Configuration restClusterClientConfig;
@@ -78,15 +81,8 @@ public class MiniClusterResource extends ExternalResource {
private int webUIPort = -1;
public MiniClusterResource(final MiniClusterResourceConfiguration miniClusterResourceConfiguration) {
- this(miniClusterResourceConfiguration, false);
- }
-
- public MiniClusterResource(
- final MiniClusterResourceConfiguration miniClusterResourceConfiguration,
- final boolean enableClusterClient) {
this.miniClusterResourceConfiguration = Preconditions.checkNotNull(miniClusterResourceConfiguration);
this.codebaseType = miniClusterResourceConfiguration.getCodebaseType();
- this.enableClusterClient = enableClusterClient;
}
public TestBaseUtils.CodebaseType getCodebaseType() {
@@ -98,12 +94,6 @@ public class MiniClusterResource extends ExternalResource {
}
public ClusterClient<?> getClusterClient() {
- if (!enableClusterClient) {
- // this check is technically only necessary for legacy clusters
- // we still fail here to keep the behaviors in sync
- throw new IllegalStateException("To use the client you must enable it with the constructor.");
- }
-
return clusterClient;
}
@@ -194,12 +184,27 @@ public class MiniClusterResource extends ExternalResource {
final LocalFlinkMiniCluster flinkMiniCluster = TestBaseUtils.startCluster(
configuration,
- !enableClusterClient); // the cluster client only works if separate actor systems are used
+ miniClusterResourceConfiguration.getRpcServiceSharing() == RpcServiceSharing.SHARED);
jobExecutorService = flinkMiniCluster;
- if (enableClusterClient) {
- clusterClient = new StandaloneClusterClient(configuration, flinkMiniCluster.highAvailabilityServices(), true);
+
+ switch (miniClusterResourceConfiguration.getRpcServiceSharing()) {
+ case SHARED:
+ Option<ActorSystem> actorSystemOption = flinkMiniCluster.firstActorSystem();
+ Preconditions.checkState(actorSystemOption.isDefined());
+
+ final ActorSystem actorSystem = actorSystemOption.get();
+ clusterClient = new StandaloneClusterClient(
+ configuration,
+ flinkMiniCluster.highAvailabilityServices(),
+ true,
+ new DefaultActorSystemLoader(actorSystem));
+ break;
+ case DEDICATED:
+ clusterClient = new StandaloneClusterClient(configuration, flinkMiniCluster.highAvailabilityServices(), true);
+ break;
}
+
Configuration restClientConfig = new Configuration();
restClientConfig.setInteger(JobManagerOptions.PORT, flinkMiniCluster.getLeaderRPCPort());
this.restClusterClientConfig = new UnmodifiableConfiguration(restClientConfig);
@@ -240,9 +245,8 @@ public class MiniClusterResource extends ExternalResource {
configuration.setInteger(RestOptions.PORT, miniCluster.getRestAddress().getPort());
jobExecutorService = miniCluster;
- if (enableClusterClient) {
- clusterClient = new MiniClusterClient(configuration, miniCluster);
- }
+ clusterClient = new MiniClusterClient(configuration, miniCluster);
+
Configuration restClientConfig = new Configuration();
restClientConfig.setString(JobManagerOptions.ADDRESS, miniCluster.getRestAddress().getHost());
restClientConfig.setInteger(RestOptions.PORT, miniCluster.getRestAddress().getPort());
http://git-wip-us.apache.org/repos/asf/flink/blob/029b9c06/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorLiveITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorLiveITCase.java b/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorLiveITCase.java
index 5944d3a..2c12e44 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorLiveITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorLiveITCase.java
@@ -89,8 +89,7 @@ public class AccumulatorLiveITCase extends TestLogger {
.setConfiguration(getConfiguration())
.setNumberTaskManagers(1)
.setNumberSlotsPerTaskManager(1)
- .build(),
- true);
+ .build());
private static Configuration getConfiguration() {
Configuration config = new Configuration();
http://git-wip-us.apache.org/repos/asf/flink/blob/029b9c06/flink-tests/src/test/java/org/apache/flink/test/cancelling/CancelingTestBase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/cancelling/CancelingTestBase.java b/flink-tests/src/test/java/org/apache/flink/test/cancelling/CancelingTestBase.java
index 871df7d..5f7ca86 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/cancelling/CancelingTestBase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/cancelling/CancelingTestBase.java
@@ -61,8 +61,7 @@ public abstract class CancelingTestBase extends TestLogger {
.setConfiguration(getConfiguration())
.setNumberTaskManagers(2)
.setNumberSlotsPerTaskManager(4)
- .build(),
- true);
+ .build());
// --------------------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/029b9c06/flink-tests/src/test/java/org/apache/flink/test/checkpointing/RescalingITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/RescalingITCase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/RescalingITCase.java
index e7fcefd..3a3eada 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/RescalingITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/RescalingITCase.java
@@ -132,8 +132,7 @@ public class RescalingITCase extends TestLogger {
.setConfiguration(config)
.setNumberTaskManagers(numTaskManagers)
.setNumberSlotsPerTaskManager(numSlots)
- .build(),
- true);
+ .build());
cluster.before();
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/029b9c06/flink-tests/src/test/java/org/apache/flink/test/checkpointing/ResumeCheckpointManuallyITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/ResumeCheckpointManuallyITCase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/ResumeCheckpointManuallyITCase.java
index f4fe8e7..24f408d 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/ResumeCheckpointManuallyITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/ResumeCheckpointManuallyITCase.java
@@ -268,8 +268,7 @@ public class ResumeCheckpointManuallyITCase extends TestLogger {
.setConfiguration(config)
.setNumberTaskManagers(NUM_TASK_MANAGERS)
.setNumberSlotsPerTaskManager(SLOTS_PER_TASK_MANAGER)
- .build(),
- true);
+ .build());
cluster.before();
http://git-wip-us.apache.org/repos/asf/flink/blob/029b9c06/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java
index b46c485..b66c745 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java
@@ -232,8 +232,7 @@ public class SavepointITCase extends TestLogger {
.setConfiguration(config)
.setNumberTaskManagers(numTaskManagers)
.setNumberSlotsPerTaskManager(numSlotsPerTaskManager)
- .build(),
- true);
+ .build());
cluster.before();
ClusterClient<?> client = cluster.getClusterClient();
@@ -301,8 +300,7 @@ public class SavepointITCase extends TestLogger {
.setConfiguration(config)
.setNumberTaskManagers(numTaskManagers)
.setNumberSlotsPerTaskManager(numSlotsPerTaskManager)
- .build(),
- true);
+ .build());
LOG.info("Shutting down Flink cluster.");
cluster.before();
@@ -346,8 +344,7 @@ public class SavepointITCase extends TestLogger {
.setConfiguration(config)
.setNumberTaskManagers(numTaskManagers)
.setNumberSlotsPerTaskManager(numSlotsPerTaskManager)
- .build(),
- true);
+ .build());
LOG.info("Restarting Flink cluster.");
cluster.before();
client = cluster.getClusterClient();
@@ -583,8 +580,7 @@ public class SavepointITCase extends TestLogger {
.setConfiguration(config)
.setNumberTaskManagers(1)
.setNumberSlotsPerTaskManager(2 * jobGraph.getMaximumParallelism())
- .build(),
- true);
+ .build());
cluster.before();
ClusterClient<?> client = cluster.getClusterClient();
@@ -713,8 +709,7 @@ public class SavepointITCase extends TestLogger {
.setConfiguration(config)
.setNumberTaskManagers(numTaskManagers)
.setNumberSlotsPerTaskManager(numSlotsPerTaskManager)
- .build(),
- true);
+ .build());
}
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/029b9c06/flink-tests/src/test/java/org/apache/flink/test/checkpointing/ZooKeeperHighAvailabilityITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/ZooKeeperHighAvailabilityITCase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/ZooKeeperHighAvailabilityITCase.java
index 6fb18e8..e02ed01 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/ZooKeeperHighAvailabilityITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/ZooKeeperHighAvailabilityITCase.java
@@ -114,8 +114,7 @@ public class ZooKeeperHighAvailabilityITCase extends TestLogger {
.setConfiguration(config)
.setNumberTaskManagers(NUM_TMS)
.setNumberSlotsPerTaskManager(NUM_SLOTS_PER_TM)
- .build(),
- true);
+ .build());
miniClusterResource.before();
}
http://git-wip-us.apache.org/repos/asf/flink/blob/029b9c06/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/SavepointMigrationTestBase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/SavepointMigrationTestBase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/SavepointMigrationTestBase.java
index 0d43aa9..a5267b5 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/SavepointMigrationTestBase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/SavepointMigrationTestBase.java
@@ -93,8 +93,7 @@ public abstract class SavepointMigrationTestBase extends TestBaseUtils {
.setConfiguration(getConfiguration())
.setNumberTaskManagers(1)
.setNumberSlotsPerTaskManager(DEFAULT_PARALLELISM)
- .build(),
- true);
+ .build());
}
private Configuration getConfiguration() throws Exception {
http://git-wip-us.apache.org/repos/asf/flink/blob/029b9c06/flink-tests/src/test/java/org/apache/flink/test/example/failing/JobSubmissionFailsITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/example/failing/JobSubmissionFailsITCase.java b/flink-tests/src/test/java/org/apache/flink/test/example/failing/JobSubmissionFailsITCase.java
index 5ca9ba2..5738eb7 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/example/failing/JobSubmissionFailsITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/example/failing/JobSubmissionFailsITCase.java
@@ -56,8 +56,7 @@ public class JobSubmissionFailsITCase extends TestLogger {
.setConfiguration(getConfiguration())
.setNumberTaskManagers(NUM_TM)
.setNumberSlotsPerTaskManager(NUM_SLOTS / NUM_TM)
- .build(),
- true);
+ .build());
private static Configuration getConfiguration() {
Configuration config = new Configuration();
http://git-wip-us.apache.org/repos/asf/flink/blob/029b9c06/flink-tests/src/test/java/org/apache/flink/test/runtime/NettyEpollITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/runtime/NettyEpollITCase.java b/flink-tests/src/test/java/org/apache/flink/test/runtime/NettyEpollITCase.java
index 5559935..418e947 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/runtime/NettyEpollITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/runtime/NettyEpollITCase.java
@@ -79,8 +79,7 @@ public class NettyEpollITCase extends TestLogger {
.setConfiguration(config)
.setNumberTaskManagers(NUM_TASK_MANAGERS)
.setNumberSlotsPerTaskManager(1)
- .build(),
- true);
+ .build());
cluster.before();
return cluster;
}
http://git-wip-us.apache.org/repos/asf/flink/blob/029b9c06/flink-tests/src/test/java/org/apache/flink/test/runtime/NetworkStackThroughputITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/runtime/NetworkStackThroughputITCase.java b/flink-tests/src/test/java/org/apache/flink/test/runtime/NetworkStackThroughputITCase.java
index c2748a5..96cb397 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/runtime/NetworkStackThroughputITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/runtime/NetworkStackThroughputITCase.java
@@ -238,9 +238,7 @@ public class NetworkStackThroughputITCase extends TestLogger {
new MiniClusterResourceConfiguration.Builder()
.setNumberTaskManagers(numTaskManagers)
.setNumberSlotsPerTaskManager(numSlotsPerTaskManager)
- .build(),
- true
- );
+ .build());
cluster.before();
try {
http://git-wip-us.apache.org/repos/asf/flink/blob/029b9c06/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/AbstractOperatorRestoreTestBase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/AbstractOperatorRestoreTestBase.java b/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/AbstractOperatorRestoreTestBase.java
index 60027c9..7eebde8 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/AbstractOperatorRestoreTestBase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/AbstractOperatorRestoreTestBase.java
@@ -75,8 +75,7 @@ public abstract class AbstractOperatorRestoreTestBase extends TestLogger {
new MiniClusterResourceConfiguration.Builder()
.setNumberTaskManagers(NUM_TMS)
.setNumberSlotsPerTaskManager(NUM_SLOTS_PER_TM)
- .build(),
- true);
+ .build());
private final boolean allowNonRestoredState;
http://git-wip-us.apache.org/repos/asf/flink/blob/029b9c06/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/TimestampITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/TimestampITCase.java b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/TimestampITCase.java
index 21051c5..5d165bf 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/TimestampITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/TimestampITCase.java
@@ -83,8 +83,7 @@ public class TimestampITCase extends TestLogger {
.setConfiguration(getConfiguration())
.setNumberTaskManagers(NUM_TASK_MANAGERS)
.setNumberSlotsPerTaskManager(NUM_TASK_SLOTS)
- .build(),
- true);
+ .build());
private static Configuration getConfiguration() {
Configuration config = new Configuration();