You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2016/12/23 20:22:56 UTC
[37/52] [abbrv] flink git commit: [FLINK-5076] Shutting down TM when
shutting down mini cluster.
[FLINK-5076] Shutting down TM when shutting down mini cluster.
This closes #2817.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/c4249008
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/c4249008
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/c4249008
Branch: refs/heads/master
Commit: c424900820e923089dc1c489bd02efa874dd39b6
Parents: 1da7924
Author: biao.liub <bi...@alibaba-inc.com>
Authored: Wed Nov 16 17:54:48 2016 +0800
Committer: Stephan Ewen <se...@apache.org>
Committed: Fri Dec 23 20:54:26 2016 +0100
----------------------------------------------------------------------
.../apache/flink/runtime/minicluster/MiniCluster.java | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/c4249008/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniCluster.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniCluster.java b/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniCluster.java
index 611d4c4..3ede5b5 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniCluster.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniCluster.java
@@ -312,6 +312,19 @@ public class MiniCluster {
resourceManagerRunners = null;
}
+ if (taskManagerRunners != null) {
+ for (TaskManagerRunner tm : taskManagerRunners) {
+ if (tm != null) {
+ try {
+ tm.shutDown(null);
+ } catch (Throwable t) {
+ exception = firstOrSuppressed(t, exception);
+ }
+ }
+ }
+ taskManagerRunners = null;
+ }
+
// shut down the RpcServices
exception = shutDownRpc(commonRpcService, exception);
exception = shutDownRpcs(jobManagerRpcServices, exception);