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/03/28 14:21:33 UTC

flink git commit: [FLINK-9026] [flip6] Close the TaskManagerMetricGroup when the TaskExecutor is shut down

Repository: flink
Updated Branches:
  refs/heads/master 066b66dd3 -> 7a21efbd4


[FLINK-9026] [flip6] Close the TaskManagerMetricGroup when the TaskExecutor is shut down

This closes #5734.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7a21efbd
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7a21efbd
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7a21efbd

Branch: refs/heads/master
Commit: 7a21efbd477ef72383464f0c70712e32a9976ebf
Parents: 066b66d
Author: sihuazhou <su...@163.com>
Authored: Wed Mar 21 17:46:31 2018 +0800
Committer: Till Rohrmann <tr...@apache.org>
Committed: Wed Mar 28 16:20:52 2018 +0200

----------------------------------------------------------------------
 .../java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java  | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/7a21efbd/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java
index 3523992..f665426 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java
@@ -292,6 +292,9 @@ public class TaskExecutor extends RpcEndpoint implements TaskExecutorGateway {
 			throwable = ExceptionUtils.firstOrSuppressed(t, throwable);
 		}
 
+		// it will call close() recursively from the parent to children
+		taskManagerMetricGroup.close();
+
 		if (throwable != null) {
 			return FutureUtils.completedExceptionally(new FlinkException("Error while shutting the TaskExecutor down.", throwable));
 		} else {