This is an automated email from the ASF dual-hosted git repository. xtsong pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit afdf4a73e43f2e6f5b2dd984aa3471f32658f9d1 Author: Yuxin Tan <[email protected]> AuthorDate: Fri Jan 6 17:41:44 2023 +0800 [FLINK-30472][network] Modify the default value of the max network memory config option --- docs/layouts/shortcodes/generated/common_memory_section.html | 4 ++-- .../shortcodes/generated/task_manager_memory_configuration.html | 4 ++-- .../java/org/apache/flink/configuration/TaskManagerOptions.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/layouts/shortcodes/generated/common_memory_section.html b/docs/layouts/shortcodes/generated/common_memory_section.html index 75c3312256b..9ee881a7cb6 100644 --- a/docs/layouts/shortcodes/generated/common_memory_section.html +++ b/docs/layouts/shortcodes/generated/common_memory_section.html @@ -136,9 +136,9 @@ </tr> <tr> <td><h5>taskmanager.memory.network.max</h5></td> - <td style="word-wrap: break-word;">1 gb</td> + <td style="word-wrap: break-word;">9223372036854775807 bytes</td> <td>MemorySize</td> - <td>Max Network Memory size for TaskExecutors. Network Memory is off-heap memory reserved for ShuffleEnvironment (e.g., network buffers). Network Memory size is derived to make up the configured fraction of the Total Flink Memory. If the derived size is less/greater than the configured min/max size, the min/max size will be used. The exact size of Network Memory can be explicitly specified by setting the min/max to the same value.</td> + <td>Max Network Memory size for TaskExecutors. Network Memory is off-heap memory reserved for ShuffleEnvironment (e.g., network buffers). Network Memory size is derived to make up the configured fraction of the Total Flink Memory. If the derived size is less/greater than the configured min/max size, the min/max size will be used. By default, the max limit of Network Memory is Long.MAX_VALUE. The exact size of Network Memory can be explicitly specified by setting the min/max t [...] </tr> <tr> <td><h5>taskmanager.memory.network.min</h5></td> diff --git a/docs/layouts/shortcodes/generated/task_manager_memory_configuration.html b/docs/layouts/shortcodes/generated/task_manager_memory_configuration.html index 99b3e9d04ce..94bd90cecce 100644 --- a/docs/layouts/shortcodes/generated/task_manager_memory_configuration.html +++ b/docs/layouts/shortcodes/generated/task_manager_memory_configuration.html @@ -88,9 +88,9 @@ </tr> <tr> <td><h5>taskmanager.memory.network.max</h5></td> - <td style="word-wrap: break-word;">1 gb</td> + <td style="word-wrap: break-word;">9223372036854775807 bytes</td> <td>MemorySize</td> - <td>Max Network Memory size for TaskExecutors. Network Memory is off-heap memory reserved for ShuffleEnvironment (e.g., network buffers). Network Memory size is derived to make up the configured fraction of the Total Flink Memory. If the derived size is less/greater than the configured min/max size, the min/max size will be used. The exact size of Network Memory can be explicitly specified by setting the min/max to the same value.</td> + <td>Max Network Memory size for TaskExecutors. Network Memory is off-heap memory reserved for ShuffleEnvironment (e.g., network buffers). Network Memory size is derived to make up the configured fraction of the Total Flink Memory. If the derived size is less/greater than the configured min/max size, the min/max size will be used. By default, the max limit of Network Memory is Long.MAX_VALUE. The exact size of Network Memory can be explicitly specified by setting the min/max t [...] </tr> <tr> <td><h5>taskmanager.memory.network.min</h5></td> diff --git a/flink-core/src/main/java/org/apache/flink/configuration/TaskManagerOptions.java b/flink-core/src/main/java/org/apache/flink/configuration/TaskManagerOptions.java index 8e4e67f0402..66db0e9ce5f 100644 --- a/flink-core/src/main/java/org/apache/flink/configuration/TaskManagerOptions.java +++ b/flink-core/src/main/java/org/apache/flink/configuration/TaskManagerOptions.java @@ -504,15 +504,15 @@ public class TaskManagerOptions { public static final ConfigOption<MemorySize> NETWORK_MEMORY_MAX = key("taskmanager.memory.network.max") .memoryType() - .defaultValue(MemorySize.parse("1g")) + .defaultValue(MemorySize.MAX_VALUE) .withDeprecatedKeys( NettyShuffleEnvironmentOptions.NETWORK_BUFFERS_MEMORY_MAX.key()) .withDescription( "Max Network Memory size for TaskExecutors. Network Memory is off-heap memory reserved for" + " ShuffleEnvironment (e.g., network buffers). Network Memory size is derived to make up the configured" + " fraction of the Total Flink Memory. If the derived size is less/greater than the configured min/max" - + " size, the min/max size will be used. The exact size of Network Memory can be explicitly specified by" - + " setting the min/max to the same value."); + + " size, the min/max size will be used. By default, the max limit of Network Memory is Long.MAX_VALUE." + + " The exact size of Network Memory can be explicitly specified by setting the min/max to the same value."); /** Fraction of Total Flink Memory to be used as Network Memory. */ @Documentation.Section(Documentation.Sections.COMMON_MEMORY)
