[FLINK-5978] Move JM WebFrontend address ConfigOption to JMOptions This closes #3552.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/160daa64 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/160daa64 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/160daa64 Branch: refs/heads/master Commit: 160daa64eff27dee8b31ad7a8b2b89f04a74c04d Parents: 5c4560d Author: mengji.fy <[email protected]> Authored: Fri May 5 12:11:20 2017 +0200 Committer: zentol <[email protected]> Committed: Tue May 9 22:56:48 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/flink/configuration/ConfigConstants.java | 7 ++++++- .../org/apache/flink/configuration/JobManagerOptions.java | 7 +++++++ .../org/apache/flink/runtime/webmonitor/WebMonitorConfig.java | 3 ++- 3 files changed, 15 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/160daa64/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 975a3d4..4897854 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 @@ -1328,7 +1328,12 @@ public final class ConfigConstants { // ------------------------- JobManager Web Frontend ---------------------- - /** The config key for the address of the JobManager web frontend. */ + /** + * The config key for the address of the JobManager web frontend. + * + * @deprecated use {@link JobManagerOptions#WEB_FRONTEND_ADDRESS} instead + */ + @Deprecated public static final ConfigOption<String> DEFAULT_JOB_MANAGER_WEB_FRONTEND_ADDRESS = key("jobmanager.web.address") .noDefaultValue(); http://git-wip-us.apache.org/repos/asf/flink/blob/160daa64/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java b/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java index 5481d7a..b0b1eee 100644 --- a/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java +++ b/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java @@ -94,6 +94,13 @@ public class JobManagerOptions { // ------------------------------------------------------------------------ /** + * Config parameter defining the runtime monitor web-frontend server address. + */ + public static final ConfigOption<String> WEB_FRONTEND_ADDRESS = + key("jobmanager.web.address") + .noDefaultValue(); + + /** * The port for the runtime monitor web-frontend server. */ public static final ConfigOption<Integer> WEB_PORT = http://git-wip-us.apache.org/repos/asf/flink/blob/160daa64/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorConfig.java ---------------------------------------------------------------------- diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorConfig.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorConfig.java index 11e94b0..1807e7d 100644 --- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorConfig.java +++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorConfig.java @@ -21,6 +21,7 @@ package org.apache.flink.runtime.webmonitor; import org.apache.flink.configuration.ConfigConstants; import org.apache.flink.configuration.Configuration; +import org.apache.flink.configuration.JobManagerOptions; public class WebMonitorConfig { @@ -62,7 +63,7 @@ public class WebMonitorConfig { } public String getWebFrontendAddress() { - return config.getValue(ConfigConstants.DEFAULT_JOB_MANAGER_WEB_FRONTEND_ADDRESS); + return config.getValue(JobManagerOptions.WEB_FRONTEND_ADDRESS); } public int getWebFrontendPort() {
