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 e33fb161f1ceee9b5d5727aaafec7f9078be6836 Author: sxnan <[email protected]> AuthorDate: Tue May 28 09:47:10 2024 +0800 [FLINK-35461][config] Deprecate taskmanager.network.max-num-tcp-connections --- .../shortcodes/generated/all_taskmanager_network_section.html | 6 ------ .../generated/netty_shuffle_environment_configuration.html | 6 ------ .../flink/configuration/NettyShuffleEnvironmentOptions.java | 9 +++++++-- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/docs/layouts/shortcodes/generated/all_taskmanager_network_section.html b/docs/layouts/shortcodes/generated/all_taskmanager_network_section.html index 57103c7cbcb..3097fddc697 100644 --- a/docs/layouts/shortcodes/generated/all_taskmanager_network_section.html +++ b/docs/layouts/shortcodes/generated/all_taskmanager_network_section.html @@ -32,12 +32,6 @@ <td>String</td> <td>The option is used to configure the base path of remote storage for hybrid shuffle. The shuffle data will be stored in remote storage when the disk space is not enough. Note: If the option is configured and taskmanager.network.hybrid-shuffle.enable-new-mode is false, this option will be ignored. If the option is not configured and taskmanager.network.hybrid-shuffle.enable-new-mode is true, the remote storage will be disabled.</td> </tr> - <tr> - <td><h5>taskmanager.network.max-num-tcp-connections</h5></td> - <td style="word-wrap: break-word;">1</td> - <td>Integer</td> - <td>The maximum number of tpc connections between taskmanagers for data communication.</td> - </tr> <tr> <td><h5>taskmanager.network.memory.buffer-debloat.enabled</h5></td> <td style="word-wrap: break-word;">false</td> diff --git a/docs/layouts/shortcodes/generated/netty_shuffle_environment_configuration.html b/docs/layouts/shortcodes/generated/netty_shuffle_environment_configuration.html index 9a81bb09013..6f261df11e5 100644 --- a/docs/layouts/shortcodes/generated/netty_shuffle_environment_configuration.html +++ b/docs/layouts/shortcodes/generated/netty_shuffle_environment_configuration.html @@ -50,12 +50,6 @@ <td>String</td> <td>The option is used to configure the base path of remote storage for hybrid shuffle. The shuffle data will be stored in remote storage when the disk space is not enough. Note: If the option is configured and taskmanager.network.hybrid-shuffle.enable-new-mode is false, this option will be ignored. If the option is not configured and taskmanager.network.hybrid-shuffle.enable-new-mode is true, the remote storage will be disabled.</td> </tr> - <tr> - <td><h5>taskmanager.network.max-num-tcp-connections</h5></td> - <td style="word-wrap: break-word;">1</td> - <td>Integer</td> - <td>The maximum number of tpc connections between taskmanagers for data communication.</td> - </tr> <tr> <td><h5>taskmanager.network.memory.read-buffer.required-per-gate.max</h5></td> <td style="word-wrap: break-word;">(none)</td> diff --git a/flink-core/src/main/java/org/apache/flink/configuration/NettyShuffleEnvironmentOptions.java b/flink-core/src/main/java/org/apache/flink/configuration/NettyShuffleEnvironmentOptions.java index a0ea6036d91..bb6e186629a 100644 --- a/flink-core/src/main/java/org/apache/flink/configuration/NettyShuffleEnvironmentOptions.java +++ b/flink-core/src/main/java/org/apache/flink/configuration/NettyShuffleEnvironmentOptions.java @@ -198,8 +198,13 @@ public class NettyShuffleEnvironmentOptions { .defaultValue("1gb") .withDescription("Maximum memory size for network buffers."); - /** The maximum number of tpc connections between taskmanagers for data communication. */ - @Documentation.Section(Documentation.Sections.ALL_TASK_MANAGER_NETWORK) + /** + * The maximum number of tpc connections between taskmanagers for data communication. + * + * @deprecated The option is unnecessary. It is deprecated in 1.20 and will be removed and + * hard-coded to 1 in 2.0. + */ + @Deprecated public static final ConfigOption<Integer> MAX_NUM_TCP_CONNECTIONS = key("taskmanager.network.max-num-tcp-connections") .intType()
