peterxcli commented on code in PR #11873:
URL: https://github.com/apache/ozone/pull/11873#discussion_r4576707343
##########
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/io/RandomAccessFileChannel.java:
##########
@@ -56,6 +64,35 @@ public synchronized void open(File file) throws
FileNotFoundException {
channel = newChannel;
}
+ /**
+ * @return the {@link BlockData} cached for the given block, or null if none
is cached for it or the cached one has
+ * a lower BCSID than requested.
+ */
+ public BlockData getCachedBlockData(BlockID blockID) {
+ final BlockData cached = cachedBlockData.get();
+ return cached != null &&
cached.getBlockID().getContainerBlockID().equals(blockID.getContainerBlockID())
+ && cached.getBlockCommitSequenceId() >=
blockID.getBlockCommitSequenceId() ? cached : null;
+ }
Review Comment:
I think we should manage the block data cache in `GrpcXceiverService#send`
https://github.com/apache/ozone/blob/fcc4d250ecaeebf1eb4666836d31b8323485993e/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/GrpcXceiverService.java#L116-L121
because the block data is actually along with `RandomAccessFileChannel
blockFile`
##########
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java:
##########
@@ -2344,20 +2344,31 @@ private long readBlockImpl(ContainerCommandRequestProto
request, RandomAccessFil
BlockUtils.verifyReplicaIdx(kvContainer, blockID);
BlockUtils.verifyBCSId(kvContainer, blockID);
- final BlockData blockData = getBlockManager().getBlock(kvContainer,
blockID);
+ if (readBlock.getOffset() < 0 || readBlock.getLength() < 0) {
+ return rejectReadBlock(blockFile, streamObserver,
Status.INVALID_ARGUMENT.withDescription(
+ "Negative offset " + readBlock.getOffset() + " or length " +
readBlock.getLength() + " for " + blockID));
+ }
+
+ // Cached per stream; re-resolve when the range reaches the cached size,
since the block may have grown.
+ BlockData blockData = blockFile.getCachedBlockData(blockID);
+ if (blockData == null || readBlock.getLength() >= blockData.getSize() -
readBlock.getOffset()) {
+ blockData = getBlockManager().getBlock(kvContainer, blockID);
+ blockFile.cacheBlockData(blockData);
+ }
if (readBlock.getOffset() >= blockData.getSize()) {
return rejectReadBlock(blockFile, streamObserver,
Status.OUT_OF_RANGE.withDescription(
"Requested offset " + readBlock.getOffset() + " is beyond the end of
block " + blockID + " with size "
+ blockData.getSize()));
}
final BlockReadCursor cursor = new BlockReadCursor(readBlock.getOffset(),
readBlock.getLength(),
responseDataSize, blockData.getChunks());
- final ByteBuffer buffer = ByteBuffer.allocate(cursor.responseDataSize());
long bytesRead = 0;
while (cursor.hasNext()) {
final BlockReadCursor.ReadRange range = cursor.next();
+ // Reused across the stream's requests: gRPC serializes the response
inside onNext, before the buffer is refilled.
+ final ByteBuffer buffer = blockFile.getReadBuffer(range.length());
Review Comment:
I think we could still manage the ownership of the read buffer in
`readblockImpl` instead of controlling it in `RandomAccessFileChannel`. as it
doesnt have any relationship with `RandomAccessFileChannel`
and https://github.com/apache/ozone/pull/12042 should allow us to remove the
code that is trying to reuse the read buffer here
--
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]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]