zentol closed pull request #6645: [hotfix] Update deprecated parameters in 
WebOptions 
URL: https://github.com/apache/flink/pull/6645
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/docs/dev/execution_plans.md b/docs/dev/execution_plans.md
index 881c54ea3d3..29a3641c356 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 28a4dd20623..0cc4644c3e5 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 0a66ca5f162..f3825043669 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 ec92051b396..eefc8b9cc1e 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 f4ec6a7e424..efdf33e3852 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 becc551e2cf..79ed8a45b4d 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 1600a3b75a0..631b0974798 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 @@
 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);


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

Reply via email to