Repository: flink Updated Branches: refs/heads/master 50fd1a36d -> 0c9c04d19
[hotfix] [core] Deprecate unused and redundant config parameter 'flink.base.dir.path' Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/8780cb6c Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/8780cb6c Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/8780cb6c Branch: refs/heads/master Commit: 8780cb6c4fa05f7cd6167f1240d03f407d8d41ea Parents: f63426b Author: Stephan Ewen <[email protected]> Authored: Fri Feb 17 14:43:37 2017 +0100 Committer: Stephan Ewen <[email protected]> Committed: Mon Feb 20 19:43:15 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/flink/configuration/ConfigConstants.java | 7 ++++++- .../org/apache/flink/runtime/jobmanager/JobManager.scala | 4 ---- .../flink/yarn/AbstractYarnFlinkApplicationMasterRunner.java | 2 -- .../org/apache/flink/yarn/YarnApplicationMasterRunner.java | 2 -- 4 files changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/8780cb6c/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java index 76c1cf7..44a78f9 100644 --- a/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java +++ b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java @@ -748,8 +748,13 @@ public final class ConfigConstants { // ----------------------------- Miscellaneous ---------------------------- /** - * The key to the Flink base directory path + * The key to the Flink base directory path. Was initially used for configurations of the + * web UI, but outdated now. + * + * @deprecated This parameter should not be used any more. A running Flink cluster should + * make no assumption about its location. */ + @Deprecated public static final String FLINK_BASE_DIR_PATH_KEY = "flink.base.dir.path"; public static final String FLINK_JVM_OPTIONS = "env.java.opts"; http://git-wip-us.apache.org/repos/asf/flink/blob/8780cb6c/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala index a335916..8b08181 100644 --- a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala +++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala @@ -2401,10 +2401,6 @@ object JobManager { } } - if (new File(configDir).isDirectory) { - configuration.setString(ConfigConstants.FLINK_BASE_DIR_PATH_KEY, configDir + "/..") - } - if (cliOptions.getWebUIPort() >= 0) { configuration.setInteger(ConfigConstants.JOB_MANAGER_WEB_PORT_KEY, cliOptions.getWebUIPort()) } http://git-wip-us.apache.org/repos/asf/flink/blob/8780cb6c/flink-yarn/src/main/java/org/apache/flink/yarn/AbstractYarnFlinkApplicationMasterRunner.java ---------------------------------------------------------------------- diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/AbstractYarnFlinkApplicationMasterRunner.java b/flink-yarn/src/main/java/org/apache/flink/yarn/AbstractYarnFlinkApplicationMasterRunner.java index a8aeb07..4b24f42 100644 --- a/flink-yarn/src/main/java/org/apache/flink/yarn/AbstractYarnFlinkApplicationMasterRunner.java +++ b/flink-yarn/src/main/java/org/apache/flink/yarn/AbstractYarnFlinkApplicationMasterRunner.java @@ -178,8 +178,6 @@ public abstract class AbstractYarnFlinkApplicationMasterRunner { Configuration configuration = GlobalConfiguration.loadConfiguration(baseDirectory); - configuration.setString(ConfigConstants.FLINK_BASE_DIR_PATH_KEY, baseDirectory); - // add dynamic properties to JobManager configuration. for (Map.Entry<String, String> property : additional.entrySet()) { configuration.setString(property.getKey(), property.getValue()); http://git-wip-us.apache.org/repos/asf/flink/blob/8780cb6c/flink-yarn/src/main/java/org/apache/flink/yarn/YarnApplicationMasterRunner.java ---------------------------------------------------------------------- diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnApplicationMasterRunner.java b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnApplicationMasterRunner.java index 9d5673c..492fc0b 100644 --- a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnApplicationMasterRunner.java +++ b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnApplicationMasterRunner.java @@ -484,8 +484,6 @@ public class YarnApplicationMasterRunner { Configuration configuration = GlobalConfiguration.loadConfiguration(baseDirectory); - configuration.setString(ConfigConstants.FLINK_BASE_DIR_PATH_KEY, baseDirectory); - // add dynamic properties to JobManager configuration. for (Map.Entry<String, String> property : additional.entrySet()) { configuration.setString(property.getKey(), property.getValue());
