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/06/24 08:43:11 UTC
[flink] branch release-1.11 updated: [FLINK-18353] Update
untranslated Chinese memory config doc files
This is an automated email from the ASF dual-hosted git repository.
azagrebin pushed a commit to branch release-1.11
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.11 by this push:
new ba26c86 [FLINK-18353] Update untranslated Chinese memory config doc files
ba26c86 is described below
commit ba26c86e34cc6b769e40bedda77bf6c4921b3f09
Author: Andrey Zagrebin <az...@apache.org>
AuthorDate: Tue Jun 23 17:33:46 2020 +0300
[FLINK-18353] Update untranslated Chinese memory config doc files
---
docs/ops/memory/mem_setup.zh.md | 17 ++++++++++-------
docs/ops/memory/mem_setup_jobmanager.zh.md | 6 ++++--
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/docs/ops/memory/mem_setup.zh.md b/docs/ops/memory/mem_setup.zh.md
index 406caaa..33b7c62 100644
--- a/docs/ops/memory/mem_setup.zh.md
+++ b/docs/ops/memory/mem_setup.zh.md
@@ -86,7 +86,7 @@ which do not have default values, have to be configured explicitly:
<br/>
<span class="label label-info">Note</span> Explicitly configuring both *total process memory* and *total Flink memory*
-is not recommended. It may lead to deployment failures due to potential memory configuration conflicts.
+is not recommended. It may lead to deployment failures due to potential memory configuration conflicts.
Configuring other memory components also requires caution as it can produce further configuration conflicts.
## JVM Parameters
@@ -94,13 +94,16 @@ Configuring other memory components also requires caution as it can produce furt
Flink explicitly adds the following memory related JVM arguments while starting its processes, based on the configured
or derived memory component sizes:
-| **JVM Arguments** | **Value for TaskManager** | **Value for JobManager** |
-| :---------------------------------------- | :------------------------------------------------- | :------------------------------------------------ |
-| *-Xmx* and *-Xms* | Framework + Task Heap Memory | JVM Heap Memory |
-| *-XX:MaxDirectMemorySize* | Framework + Task Off-heap (*) + Network Memory | Off-heap Memory (*) |
-| *-XX:MaxMetaspaceSize* | JVM Metaspace | JVM Metaspace |
+| **JVM Arguments** | **Value for TaskManager** | **Value for JobManager** |
+| :----------------------------------------------------------------------------------------- | :------------------------------------------------- | :------------------------------------------------ |
+| *-Xmx* and *-Xms* | Framework + Task Heap Memory | JVM Heap Memory |
+| *-XX:MaxDirectMemorySize*<br/>(always added only for TaskManager, see note for JobManager) | Framework + Task Off-heap (\*) + Network Memory | Off-heap Memory (\*),(\*\*) |
+| *-XX:MaxMetaspaceSize* | JVM Metaspace | JVM Metaspace |
{:.table-bordered}
-(*) Notice, that the native non-direct usage of memory in user code can be also accounted for as a part of the off-heap memory.
+(\*) Notice, that the native non-direct usage of memory in user code can be also accounted for as a part of the off-heap memory.
+<br/>
+(\*\*) The *JVM Direct memory limit* is added for JobManager process only if the corresponding option
+[`jobmanager.memory.enable-jvm-direct-memory-limit`](../config.html#jobmanager-memory-enable-jvm-direct-memory-limit) is set.
<br/><br/>
Check also the detailed memory model for [TaskManager](mem_setup_tm.html#detailed-memory-model) and
diff --git a/docs/ops/memory/mem_setup_jobmanager.zh.md b/docs/ops/memory/mem_setup_jobmanager.zh.md
index c564da9..f0125d1 100644
--- a/docs/ops/memory/mem_setup_jobmanager.zh.md
+++ b/docs/ops/memory/mem_setup_jobmanager.zh.md
@@ -74,8 +74,10 @@ The Flink scripts and CLI set the *JVM Heap* size via the JVM parameters *-Xms*
### Configure Off-heap Memory
-The *Off-heap* memory component accounts for any type of *JVM direct memory* and *native memory* usage. Therefore, it
-is also set via the corresponding JVM argument: *-XX:MaxDirectMemorySize*, see also [JVM parameters](mem_setup.html#jvm-parameters).
+The *Off-heap* memory component accounts for any type of *JVM direct memory* and *native memory* usage. Therefore,
+you can also enable the *JVM Direct Memory* limit by setting the [`jobmanager.memory.enable-jvm-direct-memory-limit`](../config.html#jobmanager-memory-enable-jvm-direct-memory-limit) option.
+If this option is configured, Flink will set the limit to the *Off-heap* memory size via the corresponding JVM argument: *-XX:MaxDirectMemorySize*.
+See also [JVM parameters](mem_setup.html#jvm-parameters).
The size of this component can be configured by [`jobmanager.memory.off-heap.size`](../config.html#jobmanager-memory-off-heap-size)
option. This option can be tuned e.g. if the JobManager process throws ‘OutOfMemoryError: Direct buffer memory’, see