[hotfix] [yarn] Remove unnecessary TaskManager configuration generation
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/24c24297 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/24c24297 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/24c24297 Branch: refs/heads/master Commit: 24c242977991c124d928798b4d71d569b6a32e4c Parents: 4b89b5d Author: Till Rohrmann <[email protected]> Authored: Wed Feb 7 18:58:32 2018 +0100 Committer: Till Rohrmann <[email protected]> Committed: Sun Feb 18 10:12:53 2018 +0100 ---------------------------------------------------------------------- .../apache/flink/yarn/YarnResourceManager.java | 24 ++++++++------------ 1 file changed, 10 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/24c24297/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java ---------------------------------------------------------------------- diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java index 305a2f5..d07ac5a 100644 --- a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java +++ b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java @@ -20,9 +20,7 @@ package org.apache.flink.yarn; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.configuration.Configuration; -import org.apache.flink.configuration.TaskManagerOptions; import org.apache.flink.runtime.clusterframework.ApplicationStatus; -import org.apache.flink.runtime.clusterframework.BootstrapTools; import org.apache.flink.runtime.clusterframework.ContaineredTaskManagerParameters; import org.apache.flink.runtime.clusterframework.types.ResourceID; import org.apache.flink.runtime.clusterframework.types.ResourceProfile; @@ -60,9 +58,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.TimeUnit; - -import scala.concurrent.duration.FiniteDuration; /** * The yarn implementation of the resource manager. Used when the system is started @@ -443,17 +438,18 @@ public class YarnResourceManager extends ResourceManager<YarnWorkerNode> impleme taskManagerParameters.taskManagerTotalMemoryMB(), taskManagerParameters.taskManagerHeapSizeMB(), taskManagerParameters.taskManagerDirectMemoryLimitMB()); - int timeout = flinkConfig.getInteger(TaskManagerOptions.MAX_REGISTRATION_DURATION.key(), - DEFAULT_TASK_MANAGER_REGISTRATION_DURATION); - FiniteDuration teRegistrationTimeout = new FiniteDuration(timeout, TimeUnit.SECONDS); - final Configuration taskManagerConfig = BootstrapTools.generateTaskManagerConfiguration( - flinkConfig, "", 0, 1, teRegistrationTimeout); - log.debug("TaskManager configuration: {}", taskManagerConfig); + + log.debug("TaskManager configuration: {}", flinkConfig); ContainerLaunchContext taskExecutorLaunchContext = Utils.createTaskExecutorContext( - flinkConfig, yarnConfig, env, - taskManagerParameters, taskManagerConfig, - currDir, YarnTaskExecutorRunner.class, log); + flinkConfig, + yarnConfig, + env, + taskManagerParameters, + flinkConfig, + currDir, + YarnTaskExecutorRunner.class, + log); // set a special environment variable to uniquely identify this container taskExecutorLaunchContext.getEnvironment()
