[hotfix] Remove validateRunsInMainThread from TaskExecutor to fix TaskExecutorTest
Currently, the TestingSerialRpcService does not play well together with the MainThreadValidatorUtil which assumes that rpc calls are dispatched to a mailbox from where they are picked up. In order to support the TestingSerialRpcService we will have to extend the MainThreadValidatorUtil to allow entering the main thread if the RpcEndpoint already runs in the context of the main thread. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/11fe3dc8 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/11fe3dc8 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/11fe3dc8 Branch: refs/heads/table-retraction Commit: 11fe3dc89f6b6b24fa21cc51d5e935e91634dbe5 Parents: 09164cf Author: Till Rohrmann <trohrm...@apache.org> Authored: Fri Mar 24 10:17:36 2017 +0100 Committer: Till Rohrmann <trohrm...@apache.org> Committed: Fri Mar 24 10:17:36 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/11fe3dc8/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 4883e7d..6ad0bd9 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 @@ -713,8 +713,6 @@ public class TaskExecutor extends RpcEndpoint<TaskExecutorGateway> { } private void closeResourceManagerConnection(Exception cause) { - validateRunsInMainThread(); - if (isConnectedToResourceManager()) { log.info("Close ResourceManager connection {}.", resourceManagerConnection.getResourceManagerId(), cause); @@ -859,8 +857,6 @@ public class TaskExecutor extends RpcEndpoint<TaskExecutorGateway> { } private void closeJobManagerConnection(JobID jobId, Exception cause) { - validateRunsInMainThread(); - log.info("Close JobManager connection for job {}.", jobId); // 1. fail tasks running under this JobID
