[FLINK-17536][core] Change the config option for slot max limitation …

…to slotmanager.number-of-slots.max This closes apache#12067.
derekm · May 12, 2020 · 9888a87 · 9888a87
1 parent 26b2e22
commit 9888a87
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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 " +