You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ga...@apache.org on 2020/05/12 09:57:21 UTC
[flink] branch master updated: [FLINK-17536][core] Change the
config option for slot max limitation to slotmanager.number-of-slots.max
This is an automated email from the ASF dual-hosted git repository.
gary 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 9888a87 [FLINK-17536][core] Change the config option for slot max limitation to slotmanager.number-of-slots.max
9888a87 is described below
commit 9888a87495827b619f5b49dae5ad29a34931d0a9
Author: Yangze Guo <ka...@gmail.com>
AuthorDate: Mon May 11 13:59:23 2020 +0800
[FLINK-17536][core] Change the config option for slot max limitation to slotmanager.number-of-slots.max
This closes #12067.
---
docs/_includes/generated/expert_scheduling_section.html | 2 +-
docs/_includes/generated/resource_manager_configuration.html | 2 +-
.../java/org/apache/flink/configuration/ResourceManagerOptions.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/_includes/generated/expert_scheduling_section.html b/docs/_includes/generated/expert_scheduling_section.html
index 5991224..9020268 100644
--- a/docs/_includes/generated/expert_scheduling_section.html
+++ b/docs/_includes/generated/expert_scheduling_section.html
@@ -27,7 +27,7 @@
<td>The timeout in milliseconds for requesting a slot from Slot Pool.</td>
</tr>
<tr>
- <td><h5>slotmanager.max-number-of-slots</h5></td>
+ <td><h5>slotmanager.number-of-slots.max</h5></td>
<td style="word-wrap: break-word;">2147483647</td>
<td>Integer</td>
<td>Defines the maximum number of slots that the Flink cluster allocates. This configuration option is meant for limiting the resource consumption for batch workloads. It is not recommended to configure this option for streaming workloads, which may fail if there are not enough slots. Note that this configuration option does not take effect for standalone clusters, where how many slots are allocated is not controlled by Flink.</td>
diff --git a/docs/_includes/generated/resource_manager_configuration.html b/docs/_includes/generated/resource_manager_configuration.html
index 5ab8e35..03090e9 100644
--- a/docs/_includes/generated/resource_manager_configuration.html
+++ b/docs/_includes/generated/resource_manager_configuration.html
@@ -33,7 +33,7 @@
<td>The timeout for an idle task manager to be released.</td>
</tr>
<tr>
- <td><h5>slotmanager.max-number-of-slots</h5></td>
+ <td><h5>slotmanager.number-of-slots.max</h5></td>
<td style="word-wrap: break-word;">2147483647</td>
<td>Integer</td>
<td>Defines the maximum number of slots that the Flink cluster allocates. This configuration option is meant for limiting the resource consumption for batch workloads. It is not recommended to configure this option for streaming workloads, which may fail if there are not enough slots. Note that this configuration option does not take effect for standalone clusters, where how many slots are allocated is not controlled by Flink.</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 f6342da..1ba2699 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
@@ -59,7 +59,7 @@ public class ResourceManagerOptions {
@Documentation.Section(Documentation.Sections.EXPERT_SCHEDULING)
public static final ConfigOption<Integer> MAX_SLOT_NUM = ConfigOptions
- .key("slotmanager.max-number-of-slots")
+ .key("slotmanager.number-of-slots.max")
.intType()
.defaultValue(Integer.MAX_VALUE)
.withDescription("Defines the maximum number of slots that the Flink cluster allocates. This configuration option " +