This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 1c44ba2 [hotfix][conf] Remove references to deprecated WebOptions
1c44ba2 is described below
commit 1c44ba209469d29f8f9e7aab454c50c5b4ddbf8f
Author: maqingxiang <35321391+maqingxi...@users.noreply.github.com>
AuthorDate: Mon Sep 3 16:12:37 2018 +0800
[hotfix][conf] Remove references to deprecated WebOptions
---
docs/dev/execution_plans.md | 2 +-
docs/monitoring/back_pressure.md | 6 +++---
docs/monitoring/checkpoint_monitoring.md | 2 +-
docs/monitoring/rest_api.md | 2 +-
flink-dist/src/main/resources/flink-conf.yaml | 4 ++--
flink-jepsen/src/jepsen/flink/db.clj | 4 ++--
.../runtime/webmonitor/handlers/legacy/JarAccessDeniedHandler.java | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/docs/dev/execution_plans.md b/docs/dev/execution_plans.md
index 881c54e..29a3641 100644
--- a/docs/dev/execution_plans.md
+++ b/docs/dev/execution_plans.md
@@ -72,7 +72,7 @@ __Web Interface__
Flink offers a web interface for submitting and executing jobs. The interface
is part of the JobManager's
web interface for monitoring, per default running on port 8081. Job submission
via this interfaces requires
-that you have set `jobmanager.web.submit.enable: true` in `flink-conf.yaml`.
+that you have set `web.submit.enable: true` in `flink-conf.yaml`.
You may specify program arguments before the job is executed. The plan
visualization enables you to show
the execution plan before executing the Flink job.
diff --git a/docs/monitoring/back_pressure.md b/docs/monitoring/back_pressure.md
index 28a4dd2..0cc4644 100644
--- a/docs/monitoring/back_pressure.md
+++ b/docs/monitoring/back_pressure.md
@@ -55,9 +55,9 @@ In order to not overload the task managers with stack trace
samples, the web int
You can configure the number of samples for the job manager with the following
configuration keys:
-- `jobmanager.web.backpressure.refresh-interval`: Time after which available
stats are deprecated and need to be refreshed (DEFAULT: 60000, 1 min).
-- `jobmanager.web.backpressure.num-samples`: Number of stack trace samples to
take to determine back pressure (DEFAULT: 100).
-- `jobmanager.web.backpressure.delay-between-samples`: Delay between stack
trace samples to determine back pressure (DEFAULT: 50, 50 ms).
+- `web.backpressure.refresh-interval`: Time after which available stats are
deprecated and need to be refreshed (DEFAULT: 60000, 1 min).
+- `web.backpressure.num-samples`: Number of stack trace samples to take to
determine back pressure (DEFAULT: 100).
+- `web.backpressure.delay-between-samples`: Delay between stack trace samples
to determine back pressure (DEFAULT: 50, 50 ms).
## Example
diff --git a/docs/monitoring/checkpoint_monitoring.md
b/docs/monitoring/checkpoint_monitoring.md
index 0a66ca5..f382504 100644
--- a/docs/monitoring/checkpoint_monitoring.md
+++ b/docs/monitoring/checkpoint_monitoring.md
@@ -70,7 +70,7 @@ You can configure the number of recent checkpoints that are
remembered for the h
{% highlight yaml %}
# Number of recent checkpoints that are remembered
-jobmanager.web.checkpoints.history: 15
+web.checkpoints.history: 15
{% endhighlight %}
### Summary Tab
diff --git a/docs/monitoring/rest_api.md b/docs/monitoring/rest_api.md
index ec92051..eefc8b9 100644
--- a/docs/monitoring/rest_api.md
+++ b/docs/monitoring/rest_api.md
@@ -661,7 +661,7 @@ Content-Type: application/x-java-archive
#### Run a Program (POST)
-Send a `POST` request to `/jars/:jarid/run`. The `jarid` parameter is the file
name of the program JAR in the configured web frontend upload directory
(configuration key `jobmanager.web.upload.dir`).
+Send a `POST` request to `/jars/:jarid/run`. The `jarid` parameter is the file
name of the program JAR in the configured web frontend upload directory
(configuration key `web.upload.dir`).
You can specify the following query parameters (all optional):
diff --git a/flink-dist/src/main/resources/flink-conf.yaml
b/flink-dist/src/main/resources/flink-conf.yaml
index f4ec6a7..efdf33e 100644
--- a/flink-dist/src/main/resources/flink-conf.yaml
+++ b/flink-dist/src/main/resources/flink-conf.yaml
@@ -126,7 +126,7 @@ parallelism.default: 1
# The address under which the web-based runtime monitor listens.
#
-#jobmanager.web.address: 0.0.0.0
+#web.address: 0.0.0.0
# The port under which the web-based runtime monitor listens.
# A value of -1 deactivates the web server.
@@ -136,7 +136,7 @@ rest.port: 8081
# Flag to specify whether job submission is enabled from the web-based
# runtime monitor. Uncomment to disable.
-#jobmanager.web.submit.enable: false
+#web.submit.enable: false
#==============================================================================
# Advanced
diff --git a/flink-jepsen/src/jepsen/flink/db.clj
b/flink-jepsen/src/jepsen/flink/db.clj
index becc551..79ed8a4 100644
--- a/flink-jepsen/src/jepsen/flink/db.clj
+++ b/flink-jepsen/src/jepsen/flink/db.clj
@@ -51,7 +51,7 @@
:high-availability.zookeeper.quorum (zookeeper-quorum test)
:high-availability.storageDir (str (:ha-storage-dir test) "/ha")
:state.savepoints.dir (str (:ha-storage-dir test)
"/savepoints")
- :web.port 8081
+ :rest.port 8081
:rest.bind-address "0.0.0.0"
:taskmanager.numberOfTaskSlots taskmanager-slots
:yarn.application-attempts 99999
@@ -219,7 +219,7 @@
"-Djobmanager.rpc.address=$(hostname -f) "
"-Djobmanager.heap.mb=2048 "
"-Djobmanager.rpc.port=6123 "
-
"-Djobmanager.web.port=8081 "
+
"-rest.port=8081 "
"-Dmesos.resourcemanager.tasks.mem=2048 "
"-Dtaskmanager.heap.mb=2048 "
"-Dtaskmanager.numberOfTaskSlots=2 "
diff --git
a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/legacy/JarAccessDeniedHandler.java
b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/legacy/JarAccessDeniedHandler.java
index 1600a3b..631b097 100644
---
a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/legacy/JarAccessDeniedHandler.java
+++
b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/legacy/JarAccessDeniedHandler.java
@@ -31,7 +31,7 @@ import java.util.concurrent.Executor;
public class JarAccessDeniedHandler extends AbstractJsonRequestHandler {
private static final String ERROR_MESSAGE = "{\"error\": \"Web
submission interface is not " +
- "available for this cluster. To enable it, set the
configuration key ' jobmanager.web.submit.enable.'\"}";
+ "available for this cluster. To enable it, set the
configuration key ' web.submit.enable.'\"}";
public JarAccessDeniedHandler(Executor executor) {
super(executor);
