ss77892 commented on code in PR #11873:
URL: https://github.com/apache/ozone/pull/11873#discussion_r4587856887
##########
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:
Yes, that should be one. Please check the latest changes.
--
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]