[hotfix] [core] Deprecate unused and redundant config parameter 'flin…

…k.base.dir.path'
imran273 · Feb 20, 2017 · 8780cb6 · 8780cb6
1 parent f63426b
commit 8780cb6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
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
@@ -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";

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
@@ -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())
     }

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
@@ -178,8 +178,6 @@ private static Configuration createConfiguration(String baseDirectory, Map<Strin
 
 		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());

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
@@ -484,8 +484,6 @@ private static Configuration createConfiguration(String baseDirectory, Map<Strin
 
 		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());