You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by sr...@apache.org on 2017/05/14 12:10:25 UTC
[02/14] flink git commit: [FLINK-5978] Move JM WebFrontend address
ConfigOption to JMOptions
[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/60deaef0
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/60deaef0
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/60deaef0
Branch: refs/heads/release-1.3
Commit: 60deaef08a8aa2a1a1cdc98acf45c066e96cd1ad
Parents: fa49915
Author: mengji.fy <me...@taobao.com>
Authored: Fri May 5 12:11:20 2017 +0200
Committer: Stefan Richter <s....@data-artisans.com>
Committed: Sun May 14 14:06:28 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/flink/configuration/ConfigConstants.java | 7 ++++++-
.../org/apache/flink/configuration/JobManagerOptions.java | 7 +++++++
.../org/apache/flink/runtime/webmonitor/WebMonitorConfig.java | 2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/60deaef0/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 61c1b27..92e6b5d 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/60deaef0/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 140ba2e..b924e8e 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/60deaef0/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 d95d13a..dba2145 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
@@ -63,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() {