WencongLiu commented on code in PR #23179: URL: https://github.com/apache/flink/pull/23179#discussion_r1294530674
########## flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/tiered/netty/NettyPayloadQueue.java: ########## @@ -0,0 +1,76 @@ +/* + * 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.hybrid.tiered.netty; + +import org.apache.flink.runtime.io.network.buffer.Buffer; + +import java.util.LinkedList; +import java.util.Optional; +import java.util.Queue; + +/** {@link NettyPayloadQueue} is used to contain all netty payloads from a storage tier. */ +public class NettyPayloadQueue { + + private final Object lock = new Object(); + + private final Queue<NettyPayload> queue = new LinkedList<>(); + + /** Number of buffers whose {@link Buffer.DataType} is buffer in the queue. */ + private int backlog = 0; Review Comment: Fixed. ########## flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/HsSubpartitionConsumerMemoryDataManager.java: ########## @@ -173,7 +179,19 @@ public void releaseDataView() { @GuardedBy("consumerLock") private void trimHeadingReleasedBuffers() { while (!unConsumedBuffers.isEmpty() && unConsumedBuffers.peekFirst().isReleased()) { - unConsumedBuffers.removeFirst(); + decreaseBacklog(unConsumedBuffers.removeFirst().getBuffer()); + } + } + + private void increaseBacklog(Buffer buffer) { + if (buffer.isBuffer()) { + backlog.getAndIncrement(); + } + } + + private void decreaseBacklog(Buffer buffer) { Review Comment: Fixed. ########## flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/HsSubpartitionConsumerMemoryDataManager.java: ########## @@ -173,7 +179,19 @@ public void releaseDataView() { @GuardedBy("consumerLock") private void trimHeadingReleasedBuffers() { while (!unConsumedBuffers.isEmpty() && unConsumedBuffers.peekFirst().isReleased()) { - unConsumedBuffers.removeFirst(); + decreaseBacklog(unConsumedBuffers.removeFirst().getBuffer()); + } + } + + private void increaseBacklog(Buffer buffer) { Review Comment: Fixed. ########## flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/HsSubpartitionFileReaderImpl.java: ########## @@ -312,14 +319,28 @@ private Optional<BufferIndexOrError> checkAndGetFirstBufferIndexOrError( // Because the update of consumption progress may be delayed, there is a // very small probability to load the buffer that has been consumed from memory. // Skip these buffers directly to avoid repeated consumption. - buffersToRecycle.add(checkNotNull(loadedBuffers.poll()).buffer); + Buffer buffer = checkNotNull(loadedBuffers.poll()).buffer; + decreaseBacklog(buffer); + buffersToRecycle.add(buffer); peek = loadedBuffers.peek(); } } return Optional.ofNullable(peek); } + private void increaseBacklog(Buffer buffer) { + if (buffer.isBuffer()) { + backlog.getAndIncrement(); + } + } + + private void decreaseBacklog(Buffer buffer) { Review Comment: Fixed. ########## flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/HsSubpartitionFileReaderImpl.java: ########## @@ -312,14 +319,28 @@ private Optional<BufferIndexOrError> checkAndGetFirstBufferIndexOrError( // Because the update of consumption progress may be delayed, there is a // very small probability to load the buffer that has been consumed from memory. // Skip these buffers directly to avoid repeated consumption. - buffersToRecycle.add(checkNotNull(loadedBuffers.poll()).buffer); + Buffer buffer = checkNotNull(loadedBuffers.poll()).buffer; + decreaseBacklog(buffer); + buffersToRecycle.add(buffer); peek = loadedBuffers.peek(); } } return Optional.ofNullable(peek); } + private void increaseBacklog(Buffer buffer) { Review Comment: Fixed. -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
