xintongsong commented on a change in pull request #15199:
URL: https://github.com/apache/flink/pull/15199#discussion_r599453245
##########
File path:
flink-core/src/main/java/org/apache/flink/configuration/TaskManagerOptions.java
##########
@@ -513,6 +513,28 @@
+ " 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 size to the same value.");
+ /**
+ * Size of direct memory used by blocking shuffle for shuffle data read
(currently only used by
+ * sort-merge shuffle).
+ */
+ @Documentation.Section(Documentation.Sections.COMMON_MEMORY)
+ public static final ConfigOption<MemorySize>
NETWORK_BATCH_SHUFFLE_READ_MEMORY =
+ key("taskmanager.memory.framework.off-heap.batch-shuffle.size")
+ .memoryType()
+ .defaultValue(MemorySize.parse("32m"))
+ .withDescription(
+ String.format(
+ "Size of memory used by blocking shuffle
for shuffle data read "
+ + "(currently only used by
sort-merge shuffle). Notes: "
+ + "1) The memory is cut from %s so
must be smaller than"
+ + " that, which means you may also
need to increase %s "
Review comment:
nit:
```suggestion
+ "1) The memory is cut from
'%s' so must be smaller than"
+ " that, which means you may
also need to increase '%s' "
```
##########
File path:
flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/BatchShuffleReadBufferPool.java
##########
@@ -0,0 +1,265 @@
+/*
+ * 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.disk;
+
+import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.configuration.TaskManagerOptions;
+import org.apache.flink.core.memory.MemorySegment;
+import org.apache.flink.core.memory.MemorySegmentFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.concurrent.GuardedBy;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.TimeoutException;
+
+import static org.apache.flink.util.Preconditions.checkArgument;
+import static org.apache.flink.util.Preconditions.checkState;
+
+/**
+ * A fixed-size {@link MemorySegment} pool used by batch shuffle for shuffle
data read (currently
+ * only used by sort-merge blocking shuffle).
+ */
+public class BatchShuffleReadBufferPool {
+
+ private static final Logger LOG =
LoggerFactory.getLogger(BatchShuffleReadBufferPool.class);
+
+ /**
+ * Memory size in bytes can be allocated from this buffer pool for a
single request (8M is for
+ * better sequential read).
+ */
+ private static final int NUM_BYTES_PER_REQUEST = 8 * 1024 * 1024;
+
+ /** Total direct memory size in bytes can can be allocated and used by
this buffer pool. */
+ private final long totalBytes;
+
+ /**
+ * Maximum time to wait in milliseconds when requesting read buffers from
this buffer pool
+ * before throwing an exception.
+ */
+ private final long requestTimeout;
+
+ /** The number of total buffers in this buffer pool. */
+ private final int numTotalBuffers;
+
+ /** Size of each buffer in bytes in this buffer pool. */
+ private final int bufferSize;
+
+ /** The number of buffers to be returned for a single request. */
+ private final int numBuffersPerRequest;
+
+ /** All available buffers in this buffer pool currently. */
+ @GuardedBy("buffers")
+ private final Queue<MemorySegment> buffers = new ArrayDeque<>();
+
+ /** Whether this buffer pool has been destroyed or not. */
+ @GuardedBy("buffers")
+ private boolean destroyed;
+
+ /** Whether this buffer pool has been initialized or not. */
+ @GuardedBy("buffers")
+ private boolean initialized;
+
+ public BatchShuffleReadBufferPool(long totalBytes, int bufferSize, long
requestTimeout) {
+ checkArgument(totalBytes > 0, "Total memory size must be positive.");
+ checkArgument(bufferSize > 0, "Size of buffer must be positive.");
+ checkArgument(requestTimeout > 0, "Request timeout must be positive.");
+
+ this.totalBytes = totalBytes;
+ this.bufferSize = bufferSize;
+ this.requestTimeout = requestTimeout;
+
+ this.numTotalBuffers = (int) Math.min(totalBytes / bufferSize,
Integer.MAX_VALUE);
+ this.numBuffersPerRequest =
+ Math.min(numTotalBuffers, Math.max(1, NUM_BYTES_PER_REQUEST /
bufferSize));
+ }
+
+ @VisibleForTesting
+ long getTotalBytes() {
+ return totalBytes;
+ }
+
+ @VisibleForTesting
+ int getNumBuffersPerRequest() {
+ return numBuffersPerRequest;
+ }
+
+ @VisibleForTesting
+ int getNumTotalBuffers() {
+ return numTotalBuffers;
+ }
+
+ @VisibleForTesting
+ int getAvailableBuffers() {
+ synchronized (buffers) {
+ return buffers.size();
+ }
+ }
+
+ public int getMaxConcurrentRequests() {
+ return numBuffersPerRequest > 0 ? numTotalBuffers /
numBuffersPerRequest : 0;
+ }
+
+ /** Initializes this buffer pool which allocates all the buffers. */
+ private void initialize() {
+ LOG.info(
+ "Initializing batch shuffle IO buffer pool: numBuffers={},
bufferSize={}.",
+ numTotalBuffers,
+ bufferSize);
+
+ checkState(
+ totalBytes >= bufferSize,
+ String.format(
+ "Illegal configuration, config value for %s must be no
smaller than %s,"
+ + " please increase %s to at least %d bytes.",
Review comment:
nit:
```suggestion
"Illegal configuration, config value for '%s' must
be no smaller than '%s',"
+ " please increase '%s' to at least %d
bytes.",
```
##########
File path:
flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/BatchShuffleReadBufferPool.java
##########
@@ -0,0 +1,265 @@
+/*
+ * 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.disk;
+
+import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.configuration.TaskManagerOptions;
+import org.apache.flink.core.memory.MemorySegment;
+import org.apache.flink.core.memory.MemorySegmentFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.concurrent.GuardedBy;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.TimeoutException;
+
+import static org.apache.flink.util.Preconditions.checkArgument;
+import static org.apache.flink.util.Preconditions.checkState;
+
+/**
+ * A fixed-size {@link MemorySegment} pool used by batch shuffle for shuffle
data read (currently
+ * only used by sort-merge blocking shuffle).
+ */
+public class BatchShuffleReadBufferPool {
+
+ private static final Logger LOG =
LoggerFactory.getLogger(BatchShuffleReadBufferPool.class);
+
+ /**
+ * Memory size in bytes can be allocated from this buffer pool for a
single request (8M is for
+ * better sequential read).
+ */
+ private static final int NUM_BYTES_PER_REQUEST = 8 * 1024 * 1024;
+
+ /** Total direct memory size in bytes can can be allocated and used by
this buffer pool. */
+ private final long totalBytes;
+
+ /**
+ * Maximum time to wait in milliseconds when requesting read buffers from
this buffer pool
+ * before throwing an exception.
+ */
+ private final long requestTimeout;
+
+ /** The number of total buffers in this buffer pool. */
+ private final int numTotalBuffers;
+
+ /** Size of each buffer in bytes in this buffer pool. */
+ private final int bufferSize;
+
+ /** The number of buffers to be returned for a single request. */
+ private final int numBuffersPerRequest;
+
+ /** All available buffers in this buffer pool currently. */
+ @GuardedBy("buffers")
+ private final Queue<MemorySegment> buffers = new ArrayDeque<>();
+
+ /** Whether this buffer pool has been destroyed or not. */
+ @GuardedBy("buffers")
+ private boolean destroyed;
+
+ /** Whether this buffer pool has been initialized or not. */
+ @GuardedBy("buffers")
+ private boolean initialized;
+
+ public BatchShuffleReadBufferPool(long totalBytes, int bufferSize, long
requestTimeout) {
+ checkArgument(totalBytes > 0, "Total memory size must be positive.");
+ checkArgument(bufferSize > 0, "Size of buffer must be positive.");
+ checkArgument(requestTimeout > 0, "Request timeout must be positive.");
+
+ this.totalBytes = totalBytes;
+ this.bufferSize = bufferSize;
+ this.requestTimeout = requestTimeout;
+
+ this.numTotalBuffers = (int) Math.min(totalBytes / bufferSize,
Integer.MAX_VALUE);
+ this.numBuffersPerRequest =
+ Math.min(numTotalBuffers, Math.max(1, NUM_BYTES_PER_REQUEST /
bufferSize));
+ }
+
+ @VisibleForTesting
+ long getTotalBytes() {
+ return totalBytes;
+ }
+
+ @VisibleForTesting
+ int getNumBuffersPerRequest() {
+ return numBuffersPerRequest;
+ }
+
+ @VisibleForTesting
+ int getNumTotalBuffers() {
+ return numTotalBuffers;
+ }
+
+ @VisibleForTesting
+ int getAvailableBuffers() {
+ synchronized (buffers) {
+ return buffers.size();
+ }
+ }
+
+ public int getMaxConcurrentRequests() {
+ return numBuffersPerRequest > 0 ? numTotalBuffers /
numBuffersPerRequest : 0;
+ }
+
+ /** Initializes this buffer pool which allocates all the buffers. */
+ private void initialize() {
+ LOG.info(
+ "Initializing batch shuffle IO buffer pool: numBuffers={},
bufferSize={}.",
+ numTotalBuffers,
+ bufferSize);
+
+ checkState(
+ totalBytes >= bufferSize,
+ String.format(
+ "Illegal configuration, config value for %s must be no
smaller than %s,"
+ + " please increase %s to at least %d bytes.",
+
TaskManagerOptions.NETWORK_BATCH_SHUFFLE_READ_MEMORY.key(),
+ TaskManagerOptions.MEMORY_SEGMENT_SIZE.key(),
+
TaskManagerOptions.NETWORK_BATCH_SHUFFLE_READ_MEMORY.key(),
+ bufferSize));
+
+ synchronized (buffers) {
+ checkState(!destroyed, "Buffer pool is already destroyed.");
+
+ if (initialized) {
+ return;
+ }
+ initialized = true;
+
+ try {
+ for (int i = 0; i < numTotalBuffers; ++i) {
+
buffers.add(MemorySegmentFactory.allocateUnpooledOffHeapMemory(bufferSize));
+ }
+ } catch (OutOfMemoryError outOfMemoryError) {
+ int allocated = buffers.size();
+ buffers.forEach(MemorySegment::free);
+ buffers.clear();
+ throw new OutOfMemoryError(
+ String.format(
+ "Can't allocate enough direct buffer for batch
shuffle read buffer "
+ + "pool (bytes allocated: %d, bytes
still needed: %d). To "
+ + "avoid the exception, you need to do
one of the following"
+ + " adjustments: 1) If you have ever
decreased %s, you need"
+ + " to undo the decrement; 2) If you
ever increased %s, you"
+ + " should also increase %s; 3) If
neither the above cases,"
+ + " it usually means some other parts
of your application "
+ + "have consumed too many direct
memory and the value of %s"
+ + " should be increased.",
+ allocated * bufferSize,
+ (numTotalBuffers - allocated) * bufferSize,
+
TaskManagerOptions.FRAMEWORK_OFF_HEAP_MEMORY.key(),
+
TaskManagerOptions.NETWORK_BATCH_SHUFFLE_READ_MEMORY.key(),
+
TaskManagerOptions.FRAMEWORK_OFF_HEAP_MEMORY.key(),
+
TaskManagerOptions.TASK_OFF_HEAP_MEMORY.key()));
+ }
+ }
+ }
+
+ /**
+ * Requests a collection of buffers (determined by {@link
#numBuffersPerRequest}) from this
+ * buffer pool. Exception will be thrown if no enough buffers can be
allocated in the given
+ * timeout.
+ */
+ public List<MemorySegment> requestBuffers() throws Exception {
+ List<MemorySegment> allocated = new ArrayList<>(numBuffersPerRequest);
+ synchronized (buffers) {
+ checkState(!destroyed, "Buffer pool is already destroyed.");
+
+ if (!initialized) {
+ initialize();
+ }
+
+ long startTime = System.currentTimeMillis();
+ while (buffers.size() < numBuffersPerRequest) {
+ checkState(!destroyed, "Buffer pool is already destroyed.");
+
+ buffers.wait(requestTimeout);
+ if (System.currentTimeMillis() - startTime >= requestTimeout) {
+ throw new TimeoutException(
+ String.format(
+ "Can't allocate enough buffers in the
given timeout, which means"
+ + " there is a fierce contention
for read buffers, please"
+ + " increase %s.",
Review comment:
nit:
```suggestion
+ " increase '%s'.",
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
