-
Notifications
You must be signed in to change notification settings - Fork 13k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FLINK-30473][network] Optimize the InputGate network memory manageme…
…nt for TaskManager This closes #21620
- Loading branch information
1 parent
afdf4a7
commit ae8de97
Showing
18 changed files
with
716 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 61 additions & 0 deletions
61
...src/main/java/org/apache/flink/runtime/io/network/partition/consumer/GateBuffersSpec.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.flink.runtime.io.network.partition.consumer; | ||
|
|
||
| /** | ||
| * The buffer specs of the {@link InputGate} include exclusive buffers per channel, required/total | ||
| * floating buffers and the target of total buffers. | ||
| */ | ||
| public class GateBuffersSpec { | ||
|
|
||
| private final int effectiveExclusiveBuffersPerChannel; | ||
|
|
||
| private final int requiredFloatingBuffers; | ||
|
|
||
| private final int totalFloatingBuffers; | ||
|
|
||
| private final int targetTotalBuffersPerGate; | ||
|
|
||
| GateBuffersSpec( | ||
| int effectiveExclusiveBuffersPerChannel, | ||
| int requiredFloatingBuffers, | ||
| int totalFloatingBuffers, | ||
| int targetTotalBuffersPerGate) { | ||
| this.effectiveExclusiveBuffersPerChannel = effectiveExclusiveBuffersPerChannel; | ||
| this.requiredFloatingBuffers = requiredFloatingBuffers; | ||
| this.totalFloatingBuffers = totalFloatingBuffers; | ||
| this.targetTotalBuffersPerGate = targetTotalBuffersPerGate; | ||
| } | ||
|
|
||
| int getRequiredFloatingBuffers() { | ||
| return requiredFloatingBuffers; | ||
| } | ||
|
|
||
| int getTotalFloatingBuffers() { | ||
| return totalFloatingBuffers; | ||
| } | ||
|
|
||
| int getEffectiveExclusiveBuffersPerChannel() { | ||
| return effectiveExclusiveBuffersPerChannel; | ||
| } | ||
|
|
||
| public int targetTotalBuffersPerGate() { | ||
| return targetTotalBuffersPerGate; | ||
| } | ||
| } |
125 changes: 125 additions & 0 deletions
125
.../main/java/org/apache/flink/runtime/io/network/partition/consumer/InputGateSpecUitls.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.flink.runtime.io.network.partition.consumer; | ||
|
|
||
| import org.apache.flink.annotation.VisibleForTesting; | ||
| import org.apache.flink.runtime.io.network.partition.ResultPartitionType; | ||
|
|
||
| import java.util.Optional; | ||
|
|
||
| import static org.apache.flink.util.Preconditions.checkArgument; | ||
| import static org.apache.flink.util.Preconditions.checkState; | ||
|
|
||
| /** Utils to manage the specs of the {@link InputGate}, for example, {@link GateBuffersSpec}. */ | ||
| public class InputGateSpecUitls { | ||
|
|
||
| public static final int DEFAULT_MAX_REQUIRED_BUFFERS_PER_GATE_FOR_BATCH = 1000; | ||
|
|
||
| public static final int DEFAULT_MAX_REQUIRED_BUFFERS_PER_GATE_FOR_STREAM = Integer.MAX_VALUE; | ||
|
|
||
| public static GateBuffersSpec createGateBuffersSpec( | ||
| Optional<Integer> configuredMaxRequiredBuffersPerGate, | ||
| int configuredNetworkBuffersPerChannel, | ||
| int configuredFloatingNetworkBuffersPerGate, | ||
| ResultPartitionType partitionType, | ||
| int numInputChannels) { | ||
| int maxRequiredBuffersThresholdPerGate = | ||
| getEffectiveMaxRequiredBuffersPerGate( | ||
| partitionType, configuredMaxRequiredBuffersPerGate); | ||
| int targetRequiredBuffersPerGate = | ||
| getRequiredBuffersTargetPerGate( | ||
| numInputChannels, configuredNetworkBuffersPerChannel); | ||
| int targetTotalBuffersPerGate = | ||
| getTotalBuffersTargetPerGate( | ||
| numInputChannels, | ||
| configuredNetworkBuffersPerChannel, | ||
| configuredFloatingNetworkBuffersPerGate); | ||
| int requiredBuffersPerGate = | ||
| Math.min(maxRequiredBuffersThresholdPerGate, targetRequiredBuffersPerGate); | ||
|
|
||
| int effectiveExclusiveBuffersPerChannel = | ||
| getExclusiveBuffersPerChannel( | ||
| configuredNetworkBuffersPerChannel, | ||
| numInputChannels, | ||
| requiredBuffersPerGate); | ||
| int effectiveExclusiveBuffersPerGate = | ||
| getEffectiveExclusiveBuffersPerGate( | ||
| numInputChannels, effectiveExclusiveBuffersPerChannel); | ||
|
|
||
| int requiredFloatingBuffers = requiredBuffersPerGate - effectiveExclusiveBuffersPerGate; | ||
| int totalFloatingBuffers = targetTotalBuffersPerGate - effectiveExclusiveBuffersPerGate; | ||
|
|
||
| checkState(requiredFloatingBuffers > 0, "Must be positive."); | ||
| checkState( | ||
| requiredFloatingBuffers <= totalFloatingBuffers, | ||
| "Wrong number of floating buffers."); | ||
|
|
||
| return new GateBuffersSpec( | ||
| effectiveExclusiveBuffersPerChannel, | ||
| requiredFloatingBuffers, | ||
| totalFloatingBuffers, | ||
| targetTotalBuffersPerGate); | ||
| } | ||
|
|
||
| @VisibleForTesting | ||
| static int getEffectiveMaxRequiredBuffersPerGate( | ||
| ResultPartitionType partitionType, | ||
| Optional<Integer> configuredMaxRequiredBuffersPerGate) { | ||
| return configuredMaxRequiredBuffersPerGate.orElseGet( | ||
| () -> | ||
| partitionType.isPipelinedOrPipelinedBoundedResultPartition() | ||
| ? DEFAULT_MAX_REQUIRED_BUFFERS_PER_GATE_FOR_STREAM | ||
| : DEFAULT_MAX_REQUIRED_BUFFERS_PER_GATE_FOR_BATCH); | ||
| } | ||
|
|
||
| /** | ||
| * Since at least one floating buffer is required, the number of required buffers is reduced by | ||
| * 1, and then the average number of buffers per channel is calculated. Returning the minimum | ||
| * value to ensure that the number of required buffers per gate is not more than the given | ||
| * requiredBuffersPerGate.}. | ||
| */ | ||
| private static int getExclusiveBuffersPerChannel( | ||
| int configuredNetworkBuffersPerChannel, | ||
| int numInputChannels, | ||
| int requiredBuffersPerGate) { | ||
| checkArgument(numInputChannels > 0, "Must be positive."); | ||
| checkArgument(requiredBuffersPerGate >= 1, "Require at least 1 buffer per gate."); | ||
| return Math.min( | ||
| configuredNetworkBuffersPerChannel, | ||
| (requiredBuffersPerGate - 1) / numInputChannels); | ||
| } | ||
|
|
||
| private static int getRequiredBuffersTargetPerGate( | ||
| int numInputChannels, int configuredNetworkBuffersPerChannel) { | ||
| return numInputChannels * configuredNetworkBuffersPerChannel + 1; | ||
| } | ||
|
|
||
| private static int getTotalBuffersTargetPerGate( | ||
| int numInputChannels, | ||
| int configuredNetworkBuffersPerChannel, | ||
| int configuredFloatingBuffersPerGate) { | ||
| return numInputChannels * configuredNetworkBuffersPerChannel | ||
| + configuredFloatingBuffersPerGate; | ||
| } | ||
|
|
||
| private static int getEffectiveExclusiveBuffersPerGate( | ||
| int numInputChannels, int effectiveExclusiveBuffersPerChannel) { | ||
| return effectiveExclusiveBuffersPerChannel * numInputChannels; | ||
| } | ||
| } |
Oops, something went wrong.