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 13:39:32 UTC
[8/9] flink git commit: Revert "[FLINK-5978] Move JM WebFrontend
address ConfigOption to JMOptions"
Revert "[FLINK-5978] Move JM WebFrontend address ConfigOption to JMOptions"
This reverts commit 60deaef08a8aa2a1a1cdc98acf45c066e96cd1ad.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/75f7e9ac
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/75f7e9ac
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/75f7e9ac
Branch: refs/heads/release-1.3
Commit: 75f7e9ac09097a940e271187f7ab78af89c2f954
Parents: 2baac89
Author: Stefan Richter <s....@data-artisans.com>
Authored: Sun May 14 15:37:25 2017 +0200
Committer: Stefan Richter <s....@data-artisans.com>
Committed: Sun May 14 15:37:25 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, 2 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/75f7e9ac/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 92e6b5d..61c1b27 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,12 +1328,7 @@ public final class ConfigConstants {
// ------------------------- JobManager Web Frontend ----------------------
- /**
- * The config key for the address of the JobManager web frontend.
- *
- * @deprecated use {@link JobManagerOptions#WEB_FRONTEND_ADDRESS} instead
- */
- @Deprecated
+ /** The config key for the address of the JobManager web frontend. */
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/75f7e9ac/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 b924e8e..140ba2e 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,13 +94,6 @@ 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/75f7e9ac/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 dba2145..d95d13a 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(JobManagerOptions.WEB_FRONTEND_ADDRESS);
+ return config.getValue(ConfigConstants.DEFAULT_JOB_MANAGER_WEB_FRONTEND_ADDRESS);
}
public int getWebFrontendPort() {