You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by az...@apache.org on 2020/01/16 11:02:49 UTC
[flink] branch release-1.10 updated:
[hotfix][coordination][configuration] Fix docs: container cutoff options
are only used for JM after FLIP-49
This is an automated email from the ASF dual-hosted git repository.
azagrebin pushed a commit to branch release-1.10
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.10 by this push:
new 9a85a5e [hotfix][coordination][configuration] Fix docs: container cutoff options are only used for JM after FLIP-49
9a85a5e is described below
commit 9a85a5ee0077fe44b0b552cb12541108f737aadc
Author: Andrey Zagrebin <az...@apache.org>
AuthorDate: Thu Jan 16 11:59:29 2020 +0100
[hotfix][coordination][configuration] Fix docs: container cutoff options are only used for JM after FLIP-49
---
docs/_includes/generated/resource_manager_configuration.html | 4 ++--
.../org/apache/flink/configuration/ResourceManagerOptions.java | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/docs/_includes/generated/resource_manager_configuration.html b/docs/_includes/generated/resource_manager_configuration.html
index b9fab66..0e7192f 100644
--- a/docs/_includes/generated/resource_manager_configuration.html
+++ b/docs/_includes/generated/resource_manager_configuration.html
@@ -12,13 +12,13 @@
<td><h5>containerized.heap-cutoff-min</h5></td>
<td style="word-wrap: break-word;">600</td>
<td>Integer</td>
- <td>Minimum amount of heap memory to remove in containers, as a safety margin.</td>
+ <td>Minimum amount of heap memory to remove in Job Master containers, as a safety margin.</td>
</tr>
<tr>
<td><h5>containerized.heap-cutoff-ratio</h5></td>
<td style="word-wrap: break-word;">0.25</td>
<td>Float</td>
- <td>Percentage of heap space to remove from containers (YARN / Mesos / Kubernetes), to compensate for other JVM memory usage.</td>
+ <td>Percentage of heap space to remove from Job Master containers (YARN / Mesos / Kubernetes), to compensate for other JVM memory usage.</td>
</tr>
<tr>
<td><h5>local.number-resourcemanager</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 4bf354e..869e97f 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
@@ -56,24 +56,24 @@ public class ResourceManagerOptions {
" Its not possible to use this configuration key to define port ranges.");
/**
- * Percentage of heap space to remove from containers (YARN / Mesos/ Kubernetes), to compensate
+ * Percentage of heap space to remove from Job Master containers (YARN / Mesos/ Kubernetes), to compensate
* for other JVM memory usage.
*/
public static final ConfigOption<Float> CONTAINERIZED_HEAP_CUTOFF_RATIO = ConfigOptions
.key("containerized.heap-cutoff-ratio")
.defaultValue(0.25f)
.withDeprecatedKeys("yarn.heap-cutoff-ratio")
- .withDescription("Percentage of heap space to remove from containers (YARN / Mesos / Kubernetes), to compensate" +
- " for other JVM memory usage.");
+ .withDescription("Percentage of heap space to remove from Job Master containers (YARN / Mesos / Kubernetes), " +
+ "to compensate for other JVM memory usage.");
/**
- * Minimum amount of heap memory to remove in containers, as a safety margin.
+ * Minimum amount of heap memory to remove in Job Master containers, as a safety margin.
*/
public static final ConfigOption<Integer> CONTAINERIZED_HEAP_CUTOFF_MIN = ConfigOptions
.key("containerized.heap-cutoff-min")
.defaultValue(600)
.withDeprecatedKeys("yarn.heap-cutoff-min")
- .withDescription("Minimum amount of heap memory to remove in containers, as a safety margin.");
+ .withDescription("Minimum amount of heap memory to remove in Job Master containers, as a safety margin.");
/**
* The timeout for a slot request to be discarded, in milliseconds.