flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trohrm...@apache.org
Subject [flink] branch release-1.13 updated: [hotfix][conf] Correct config option reference in resourcemanager.standalone.start-up-time
Date Tue, 20 Jul 2021 13:27:42 GMT
This is an automated email from the ASF dual-hosted git repository.

trohrmann pushed a commit to branch release-1.13
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/release-1.13 by this push:
     new 9973de3  [hotfix][conf] Correct config option reference in resourcemanager.standalone.start-up-time
9973de3 is described below

commit 9973de3a5e639a5ef850c63a55a9dde9206b5c08
Author: Till Rohrmann <trohrmann@apache.org>
AuthorDate: Tue Jul 20 15:23:17 2021 +0200

    [hotfix][conf] Correct config option reference in resourcemanager.standalone.start-up-time
---
 .../generated/resource_manager_configuration.html       |  2 +-
 .../flink/configuration/ResourceManagerOptions.java     | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/docs/layouts/shortcodes/generated/resource_manager_configuration.html b/docs/layouts/shortcodes/generated/resource_manager_configuration.html
index ae9767a..8cdc5e5 100644
--- a/docs/layouts/shortcodes/generated/resource_manager_configuration.html
+++ b/docs/layouts/shortcodes/generated/resource_manager_configuration.html
@@ -24,7 +24,7 @@
             <td><h5>resourcemanager.standalone.start-up-time</h5></td>
             <td style="word-wrap: break-word;">-1</td>
             <td>Long</td>
-            <td>Time in milliseconds of the start-up period of a standalone cluster.
During this time, resource manager of the standalone cluster expects new task executors to
be registered, and will not fail slot requests that can not be satisfied by any current registered
slots. After this time, it will fail pending and new coming requests immediately that can
not be satisfied by registered slots. If not set, 'slotmanager.request-timeout' will be used
by default.</td>
+            <td>Time in milliseconds of the start-up period of a standalone cluster.
During this time, resource manager of the standalone cluster expects new task executors to
be registered, and will not fail slot requests that can not be satisfied by any current registered
slots. After this time, it will fail pending and new coming requests immediately that can
not be satisfied by registered slots. If not set, <code class="highlighter-rouge">slot.request.timeout</code>
will be used by d [...]
         </tr>
         <tr>
             <td><h5>resourcemanager.start-worker.max-failure-rate</h5></td>
diff --git a/flink-core/src/main/java/org/apache/flink/configuration/ResourceManagerOptions.java
b/flink-core/src/main/java/org/apache/flink/configuration/ResourceManagerOptions.java
index 3c03612..382d292 100644
--- a/flink-core/src/main/java/org/apache/flink/configuration/ResourceManagerOptions.java
+++ b/flink-core/src/main/java/org/apache/flink/configuration/ResourceManagerOptions.java
@@ -21,6 +21,7 @@ package org.apache.flink.configuration;
 import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.annotation.docs.Documentation;
 import org.apache.flink.configuration.description.Description;
+import org.apache.flink.configuration.description.TextElement;
 
 import java.time.Duration;
 
@@ -161,13 +162,19 @@ public class ResourceManagerOptions {
      */
     public static final ConfigOption<Long> STANDALONE_CLUSTER_STARTUP_PERIOD_TIME =
             ConfigOptions.key("resourcemanager.standalone.start-up-time")
+                    .longType()
                     .defaultValue(-1L)
                     .withDescription(
-                            "Time in milliseconds of the start-up period of a standalone
cluster. During this time, "
-                                    + "resource manager of the standalone cluster expects
new task executors to be registered, and will not "
-                                    + "fail slot requests that can not be satisfied by any
current registered slots. After this time, it will "
-                                    + "fail pending and new coming requests immediately that
can not be satisfied by registered slots. If not "
-                                    + "set, 'slotmanager.request-timeout' will be used by
default.");
+                            Description.builder()
+                                    .text(
+                                            "Time in milliseconds of the start-up period
of a standalone cluster. During this time, "
+                                                    + "resource manager of the standalone
cluster expects new task executors to be registered, and will not "
+                                                    + "fail slot requests that can not be
satisfied by any current registered slots. After this time, it will "
+                                                    + "fail pending and new coming requests
immediately that can not be satisfied by registered slots. If not "
+                                                    + "set, %s will be used by default.",
+                                            TextElement.code(
+                                                    JobManagerOptions.SLOT_REQUEST_TIMEOUT.key()))
+                                    .build());
 
     /**
      * The timeout for an idle task manager to be released, in milliseconds.

Mime
View raw message