Repository: flink Updated Branches: refs/heads/master 9a2ba6e05 -> 152f6c9af
[FLINK-7739][tests] Properly close flink mini cluster Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/f30f91a3 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f30f91a3 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f30f91a3 Branch: refs/heads/master Commit: f30f91a34f532996a322ac21737503fe40287ae8 Parents: 9eb878e Author: Piotr Nowojski <[email protected]> Authored: Fri Sep 29 14:50:37 2017 +0200 Committer: Till Rohrmann <[email protected]> Committed: Tue Oct 31 00:04:59 2017 +0100 ---------------------------------------------------------------------- .../connectors/kafka/KafkaShortRetentionTestBase.java | 2 +- .../flink/streaming/connectors/kafka/KafkaTestBase.java | 3 +-- .../itcases/NonHAAbstractQueryableStateTestBase.java | 2 +- .../runtime/webmonitor/WebRuntimeMonitorITCase.java | 6 +++--- .../flink/runtime/minicluster/FlinkMiniCluster.scala | 4 ++-- .../runtime/checkpoint/CoordinatorShutdownTest.java | 6 ++---- .../runtime/client/JobClientActorRecoveryITCase.java | 2 +- .../runtime/jobmanager/JobManagerCleanupITCase.java | 2 +- .../apache/flink/runtime/jobmanager/JobManagerTest.java | 12 ++++++------ .../TaskCancelAsyncProducerConsumerITCase.java | 2 +- .../flink/test/accumulators/AccumulatorErrorITCase.java | 2 +- .../flink/test/checkpointing/RescalingITCase.java | 2 +- .../flink/test/checkpointing/SavepointITCase.java | 11 +++++++---- .../flink/test/classloading/ClassLoaderITCase.java | 2 +- .../test/example/failing/JobSubmissionFailsITCase.java | 2 +- .../flink/test/manual/NotSoMiniClusterIterations.java | 2 +- .../test/manual/StreamingScalabilityAndLatency.java | 2 +- .../flink/test/misc/CustomSerializationITCase.java | 2 +- .../flink/test/misc/MiscellaneousIssuesITCase.java | 2 +- .../misc/SuccessAfterNetworkBuffersFailureITCase.java | 2 +- .../recovery/JobManagerHAJobGraphRecoveryITCase.java | 2 +- .../apache/flink/test/runtime/IPv6HostnamesITCase.java | 2 +- .../flink/test/streaming/runtime/TimestampITCase.java | 2 +- 23 files changed, 38 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/f30f91a3/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaShortRetentionTestBase.java ---------------------------------------------------------------------- diff --git a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaShortRetentionTestBase.java b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaShortRetentionTestBase.java index fbf902f..30f6dc2 100644 --- a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaShortRetentionTestBase.java +++ b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaShortRetentionTestBase.java @@ -119,7 +119,7 @@ public class KafkaShortRetentionTestBase implements Serializable { TestStreamEnvironment.unsetAsContext(); if (flink != null) { - flink.shutdown(); + flink.stop(); } kafkaServer.shutdown(); http://git-wip-us.apache.org/repos/asf/flink/blob/f30f91a3/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 fcdb59b..74485b4 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 @@ -174,7 +174,7 @@ public abstract class KafkaTestBase extends TestLogger { protected static void shutdownClusters() throws Exception { if (flink != null) { - flink.shutdown(); + flink.stop(); } if (secureProps != null) { @@ -182,7 +182,6 @@ public abstract class KafkaTestBase extends TestLogger { } kafkaServer.shutdown(); - } // ------------------------------------------------------------------------ http://git-wip-us.apache.org/repos/asf/flink/blob/f30f91a3/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/NonHAAbstractQueryableStateTestBase.java ---------------------------------------------------------------------- diff --git a/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/NonHAAbstractQueryableStateTestBase.java b/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/NonHAAbstractQueryableStateTestBase.java index 2937a51..3f1a1fb 100644 --- a/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/NonHAAbstractQueryableStateTestBase.java +++ b/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/NonHAAbstractQueryableStateTestBase.java @@ -68,7 +68,7 @@ public abstract class NonHAAbstractQueryableStateTestBase extends AbstractQuerya @AfterClass public static void tearDown() { try { - cluster.shutdown(); + cluster.stop(); } catch (Exception e) { e.printStackTrace(); fail(e.getMessage()); http://git-wip-us.apache.org/repos/asf/flink/blob/f30f91a3/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitorITCase.java ---------------------------------------------------------------------- diff --git a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitorITCase.java b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitorITCase.java index 3627ce7..f9dd98e 100644 --- a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitorITCase.java +++ b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitorITCase.java @@ -130,7 +130,7 @@ public class WebRuntimeMonitorITCase extends TestLogger { } finally { if (flink != null) { - flink.shutdown(); + flink.stop(); } } } @@ -411,7 +411,7 @@ public class WebRuntimeMonitorITCase extends TestLogger { } } finally { if (flink != null) { - flink.shutdown(); + flink.stop(); } } } @@ -471,7 +471,7 @@ public class WebRuntimeMonitorITCase extends TestLogger { } } finally { if (flink != null) { - flink.shutdown(); + flink.stop(); } } } http://git-wip-us.apache.org/repos/asf/flink/blob/f30f91a3/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 5692863..c152f4a 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 @@ -419,7 +419,7 @@ abstract class FlinkMiniCluster( def stop(): Unit = { LOG.info("Stopping FlinkMiniCluster.") - shutdown() + startInternalShutdown() awaitTermination() jobManagerLeaderRetrievalService.foreach(_.stop()) @@ -435,7 +435,7 @@ abstract class FlinkMiniCluster( ioExecutor) } - protected def shutdown(): Unit = { + protected def startInternalShutdown(): Unit = { webMonitor foreach { _.stop() } http://git-wip-us.apache.org/repos/asf/flink/blob/f30f91a3/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CoordinatorShutdownTest.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CoordinatorShutdownTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CoordinatorShutdownTest.java index c4676e2..482290a 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CoordinatorShutdownTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CoordinatorShutdownTest.java @@ -116,8 +116,7 @@ public class CoordinatorShutdownTest extends TestLogger { } finally { if (cluster != null) { - cluster.shutdown(); - cluster.awaitTermination(); + cluster.stop(); } } } @@ -186,8 +185,7 @@ public class CoordinatorShutdownTest extends TestLogger { } finally { if (cluster != null) { - cluster.shutdown(); - cluster.awaitTermination(); + cluster.stop(); } } } http://git-wip-us.apache.org/repos/asf/flink/blob/f30f91a3/flink-runtime/src/test/java/org/apache/flink/runtime/client/JobClientActorRecoveryITCase.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/client/JobClientActorRecoveryITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/client/JobClientActorRecoveryITCase.java index e947744..4fdaef5 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/client/JobClientActorRecoveryITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/client/JobClientActorRecoveryITCase.java @@ -132,7 +132,7 @@ public class JobClientActorRecoveryITCase extends TestLogger { // if the job fails then an exception is thrown here Await.result(promise.future(), deadline.timeLeft()); } finally { - cluster.shutdown(); + cluster.stop(); } } http://git-wip-us.apache.org/repos/asf/flink/blob/f30f91a3/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerCleanupITCase.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerCleanupITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerCleanupITCase.java index 5f556ad..8806dec 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerCleanupITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerCleanupITCase.java @@ -255,7 +255,7 @@ public class JobManagerCleanupITCase extends TestLogger { fail(e.getMessage()); } finally { if (cluster != null) { - cluster.shutdown(); + cluster.stop(); } if (tempBlob != null) { assertTrue(tempBlob.delete()); http://git-wip-us.apache.org/repos/asf/flink/blob/f30f91a3/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerTest.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerTest.java index 889191f..bd7f11f 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerTest.java @@ -306,7 +306,7 @@ public class JobManagerTest extends TestLogger { fail(e.getMessage()); } finally { if (cluster != null) { - cluster.shutdown(); + cluster.stop(); } } } @@ -397,7 +397,7 @@ public class JobManagerTest extends TestLogger { fail(e.getMessage()); } finally { if (cluster != null) { - cluster.shutdown(); + cluster.stop(); } } } @@ -493,7 +493,7 @@ public class JobManagerTest extends TestLogger { fail(e.getMessage()); } finally { if (cluster != null) { - cluster.shutdown(); + cluster.stop(); } } } @@ -545,7 +545,7 @@ public class JobManagerTest extends TestLogger { expectMsgClass(JobResultSuccess.class); } finally { if (cluster != null) { - cluster.shutdown(); + cluster.stop(); } } } @@ -599,7 +599,7 @@ public class JobManagerTest extends TestLogger { expectMsgClass(ExecutionGraphFound.class); } finally { if (cluster != null) { - cluster.shutdown(); + cluster.stop(); } } } @@ -1025,7 +1025,7 @@ public class JobManagerTest extends TestLogger { fail("Unexpected cancellation response from JobManager: " + cancellationResponse); } } finally { - testingCluster.shutdown(); + testingCluster.stop(); } } http://git-wip-us.apache.org/repos/asf/flink/blob/f30f91a3/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskCancelAsyncProducerConsumerITCase.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskCancelAsyncProducerConsumerITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskCancelAsyncProducerConsumerITCase.java index 69f1a49..b2b118c 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskCancelAsyncProducerConsumerITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskCancelAsyncProducerConsumerITCase.java @@ -166,7 +166,7 @@ public class TaskCancelAsyncProducerConsumerITCase extends TestLogger { assertEquals(IllegalStateException.class, ASYNC_CONSUMER_EXCEPTION.getClass()); } finally { if (flink != null) { - flink.shutdown(); + flink.stop(); } } } http://git-wip-us.apache.org/repos/asf/flink/blob/f30f91a3/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorErrorITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorErrorITCase.java b/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorErrorITCase.java index 4de1602..282b192 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorErrorITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorErrorITCase.java @@ -65,7 +65,7 @@ public class AccumulatorErrorITCase extends TestLogger { @AfterClass public static void shutdownCluster() { - cluster.shutdown(); + cluster.stop(); cluster = null; } http://git-wip-us.apache.org/repos/asf/flink/blob/f30f91a3/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 99fb6ef..7c2bb38 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 @@ -139,7 +139,7 @@ public class RescalingITCase extends TestLogger { @AfterClass public static void shutDownExistingCluster() { if (cluster != null) { - cluster.shutdown(); + cluster.stop(); cluster.awaitTermination(); } } http://git-wip-us.apache.org/repos/asf/flink/blob/f30f91a3/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 c96758c..6f33a2f 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 @@ -213,8 +213,8 @@ public class SavepointITCase extends TestLogger { // Shut down the Flink cluster (thereby canceling the job) LOG.info("Shutting down Flink cluster."); - flink.shutdown(); - flink.awaitTermination(); + flink.stop(); + flink = null; // - Verification START ------------------------------------------- @@ -251,6 +251,7 @@ public class SavepointITCase extends TestLogger { // Restart the cluster LOG.info("Restarting Flink cluster."); + flink = new TestingCluster(config); flink.start(); // Retrieve the job manager @@ -409,7 +410,7 @@ public class SavepointITCase extends TestLogger { // - Verification END --------------------------------------------- } finally { if (flink != null) { - flink.shutdown(); + flink.stop(); } } } @@ -472,7 +473,7 @@ public class SavepointITCase extends TestLogger { } } finally { if (flink != null) { - flink.shutdown(); + flink.stop(); } } } @@ -572,6 +573,8 @@ public class SavepointITCase extends TestLogger { flink = new TestingCluster(config); try { LOG.info("Restarting Flink cluster."); + flink = new TestingCluster(config); + flink.start(true); // Retrieve the job manager http://git-wip-us.apache.org/repos/asf/flink/blob/f30f91a3/flink-tests/src/test/java/org/apache/flink/test/classloading/ClassLoaderITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/classloading/ClassLoaderITCase.java b/flink-tests/src/test/java/org/apache/flink/test/classloading/ClassLoaderITCase.java index a09633d..58caf5c 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/classloading/ClassLoaderITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/classloading/ClassLoaderITCase.java @@ -129,7 +129,7 @@ public class ClassLoaderITCase extends TestLogger { @AfterClass public static void tearDown() throws Exception { if (testCluster != null) { - testCluster.shutdown(); + testCluster.stop(); } TestStreamEnvironment.unsetAsContext(); http://git-wip-us.apache.org/repos/asf/flink/blob/f30f91a3/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 1383894..a647af9 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 @@ -81,7 +81,7 @@ public class JobSubmissionFailsITCase extends TestLogger { @AfterClass public static void teardown() { try { - cluster.shutdown(); + cluster.stop(); } catch (Exception e) { e.printStackTrace(); http://git-wip-us.apache.org/repos/asf/flink/blob/f30f91a3/flink-tests/src/test/java/org/apache/flink/test/manual/NotSoMiniClusterIterations.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/manual/NotSoMiniClusterIterations.java b/flink-tests/src/test/java/org/apache/flink/test/manual/NotSoMiniClusterIterations.java index 0b8fd1c..9f6bcbb 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/manual/NotSoMiniClusterIterations.java +++ b/flink-tests/src/test/java/org/apache/flink/test/manual/NotSoMiniClusterIterations.java @@ -70,7 +70,7 @@ public class NotSoMiniClusterIterations { } finally { if (cluster != null) { - cluster.shutdown(); + cluster.stop(); } } } http://git-wip-us.apache.org/repos/asf/flink/blob/f30f91a3/flink-tests/src/test/java/org/apache/flink/test/manual/StreamingScalabilityAndLatency.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/manual/StreamingScalabilityAndLatency.java b/flink-tests/src/test/java/org/apache/flink/test/manual/StreamingScalabilityAndLatency.java index c7f43fa..efcefeb 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/manual/StreamingScalabilityAndLatency.java +++ b/flink-tests/src/test/java/org/apache/flink/test/manual/StreamingScalabilityAndLatency.java @@ -68,7 +68,7 @@ public class StreamingScalabilityAndLatency { } finally { if (cluster != null) { - cluster.shutdown(); + cluster.stop(); } } } http://git-wip-us.apache.org/repos/asf/flink/blob/f30f91a3/flink-tests/src/test/java/org/apache/flink/test/misc/CustomSerializationITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/misc/CustomSerializationITCase.java b/flink-tests/src/test/java/org/apache/flink/test/misc/CustomSerializationITCase.java index 1532741..ad359f6 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/misc/CustomSerializationITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/misc/CustomSerializationITCase.java @@ -67,7 +67,7 @@ public class CustomSerializationITCase extends TestLogger { @AfterClass public static void shutdownCluster() { - cluster.shutdown(); + cluster.stop(); cluster = null; } http://git-wip-us.apache.org/repos/asf/flink/blob/f30f91a3/flink-tests/src/test/java/org/apache/flink/test/misc/MiscellaneousIssuesITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/misc/MiscellaneousIssuesITCase.java b/flink-tests/src/test/java/org/apache/flink/test/misc/MiscellaneousIssuesITCase.java index 00b4485..d79b339 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/misc/MiscellaneousIssuesITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/misc/MiscellaneousIssuesITCase.java @@ -77,7 +77,7 @@ public class MiscellaneousIssuesITCase extends TestLogger { @AfterClass public static void shutdownCluster() { - cluster.shutdown(); + cluster.stop(); cluster = null; } http://git-wip-us.apache.org/repos/asf/flink/blob/f30f91a3/flink-tests/src/test/java/org/apache/flink/test/misc/SuccessAfterNetworkBuffersFailureITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/misc/SuccessAfterNetworkBuffersFailureITCase.java b/flink-tests/src/test/java/org/apache/flink/test/misc/SuccessAfterNetworkBuffersFailureITCase.java index fd556d5..8f4bc8c 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/misc/SuccessAfterNetworkBuffersFailureITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/misc/SuccessAfterNetworkBuffersFailureITCase.java @@ -97,7 +97,7 @@ public class SuccessAfterNetworkBuffersFailureITCase extends TestLogger { } finally { if (cluster != null) { - cluster.shutdown(); + cluster.stop(); } } } http://git-wip-us.apache.org/repos/asf/flink/blob/f30f91a3/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHAJobGraphRecoveryITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHAJobGraphRecoveryITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHAJobGraphRecoveryITCase.java index 44b27cd..b575dca 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHAJobGraphRecoveryITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHAJobGraphRecoveryITCase.java @@ -145,7 +145,7 @@ public class JobManagerHAJobGraphRecoveryITCase extends TestLogger { jobManager, deadline.timeLeft()); } finally { - flink.shutdown(); + flink.stop(); } // verify that the persisted job data has not been removed from ZooKeeper when the JM has http://git-wip-us.apache.org/repos/asf/flink/blob/f30f91a3/flink-tests/src/test/java/org/apache/flink/test/runtime/IPv6HostnamesITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/runtime/IPv6HostnamesITCase.java b/flink-tests/src/test/java/org/apache/flink/test/runtime/IPv6HostnamesITCase.java index 09be1cd..f24d21e 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/runtime/IPv6HostnamesITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/runtime/IPv6HostnamesITCase.java @@ -110,7 +110,7 @@ public class IPv6HostnamesITCase extends TestLogger { } finally { if (flink != null) { - flink.shutdown(); + flink.stop(); } } } http://git-wip-us.apache.org/repos/asf/flink/blob/f30f91a3/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 9b1dd2a..0deda4b 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 @@ -99,7 +99,7 @@ public class TimestampITCase extends TestLogger { @AfterClass public static void shutdownCluster() { - cluster.shutdown(); + cluster.stop(); cluster = null; TestStreamEnvironment.unsetAsContext();
