Skip to content

fix(issues1300): fix stream reader empty blocks #1301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 26, 2024
Merged

fix(issues1300): fix stream reader empty blocks #1301

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 31 additions & 19 deletions s3stream/src/main/java/com/automq/stream/s3/cache/blockcache/StreamReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
import com.automq.stream.utils.LogSuppressor;
import com.automq.stream.utils.threads.EventLoop;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
Expand Down Expand Up @@ -71,7 +69,7 @@ public class StreamReader {
private final Function<S3ObjectMetadata, ObjectReader> objectReaderFactory;
private final DataBlockCache dataBlockCache;
long nextReadOffset;
private CompletableFuture<Map<Long, Block>> inflightLoadIndexCf;
private CompletableFuture<Void> inflightLoadIndexCf;
private long lastAccessTimestamp = System.currentTimeMillis();

private boolean closed = false;
Expand Down Expand Up @@ -142,7 +140,7 @@ public void close() {
blocksMap.forEach((k, v) -> v.markRead());
}

void read0(ReadContext ctx, long startOffset, long endOffset, int maxBytes) {
void read0(ReadContext ctx, final long startOffset, final long endOffset, final int maxBytes) {
// 1. get blocks
CompletableFuture<List<Block>> getBlocksCf = getBlocks(startOffset, endOffset, maxBytes, false);

Expand Down Expand Up @@ -170,6 +168,11 @@ void read0(ReadContext ctx, long startOffset, long endOffset, int maxBytes) {
ctx.cf.completeExceptionally(failedBlock.get().exception);
return;
}
if (blocks.isEmpty()) {
ctx.cf.completeExceptionally(new AutoMQException(String.format("[UNEXPECTED] streamId=%d Get empty blocks [%s, %s) %s",
streamId, startOffset, endOffset, maxBytes)));
return;
}
ctx.blocks.addAll(blocks);
int remainingSize = maxBytes;
long nextStartOffset = startOffset;
Expand Down Expand Up @@ -260,7 +263,7 @@ private CompletableFuture<List<Block>> getBlocks(long startOffset, long endOffse

private void getBlocks0(GetBlocksContext ctx, long startOffset, long endOffset, int maxBytes) {
Long floorKey = blocksMap.floorKey(startOffset);
CompletableFuture<Map<Long, Block>> loadMoreBlocksCf;
CompletableFuture<Boolean> loadMoreBlocksCf;
int remainingSize = maxBytes;
if (floorKey == null || startOffset >= loadedBlockIndexEndOffset) {
loadMoreBlocksCf = loadMoreBlocksWithoutData(endOffset);
Expand Down Expand Up @@ -299,17 +302,23 @@ private void getBlocks0(GetBlocksContext ctx, long startOffset, long endOffset,
}
int finalRemainingSize = remainingSize;
// use async to prevent recursive call cause stack overflow
loadMoreBlocksCf.thenAcceptAsync(rst -> {
if (rst.isEmpty()) {
// it's already load to the end
if (endOffset != -1L && endOffset > loadedBlockIndexEndOffset) {
loadMoreBlocksCf.thenAcceptAsync(moreBlocks -> {
boolean readMore = false;
if (ctx.readahead) {
// If #loadMoreBlocksWithoutData result is empty, it means the stream is already loads to the end.
if (moreBlocks) {
readMore = true;
}
} else {
if (!moreBlocks && endOffset > loadedBlockIndexEndOffset) {
String errMsg = String.format("[BUG] streamId=%s expect load blocks to endOffset=%s, " +
"current loadedBlockIndexEndOffset=%s", streamId, endOffset, loadedBlockIndexEndOffset);
ctx.cf.completeExceptionally(new AutoMQException(errMsg));
} else {
ctx.cf.complete(ctx.blocks);
readMore = true;
}
} else {
}
if (readMore) {
long nextStartOffset = ctx.blocks.isEmpty() ? startOffset : ctx.blocks.get(ctx.blocks.size() - 1).index.endOffset();
getBlocks0(ctx, nextStartOffset, endOffset, finalRemainingSize);
}
Expand All @@ -322,20 +331,24 @@ private void getBlocks0(GetBlocksContext ctx, long startOffset, long endOffset,
/**
* Load more block indexes
*
* @return new block indexes
* @return whether load more blocks
*/
private CompletableFuture<Map<Long, Block>> loadMoreBlocksWithoutData(long endOffset) {
private CompletableFuture<Boolean> loadMoreBlocksWithoutData(long endOffset) {
long oldLoadedBlockIndexEndOffset = loadedBlockIndexEndOffset;
return loadMoreBlocksWithoutData0(endOffset).thenApply(nil -> loadedBlockIndexEndOffset != oldLoadedBlockIndexEndOffset);
}

private CompletableFuture<Void> loadMoreBlocksWithoutData0(long endOffset) {
if (inflightLoadIndexCf != null) {
return inflightLoadIndexCf.thenCompose(rst -> loadMoreBlocksWithoutData(endOffset));
return inflightLoadIndexCf.thenCompose(rst -> loadMoreBlocksWithoutData0(endOffset));
}
if (endOffset != -1L && endOffset <= loadedBlockIndexEndOffset) {
return CompletableFuture.completedFuture(Collections.emptyMap());
return CompletableFuture.completedFuture(null);
}

inflightLoadIndexCf = new CompletableFuture<>();
long nextLoadingOffset = calWindowBlocksEndOffset();
AtomicLong nextFindStartOffset = new AtomicLong(nextLoadingOffset);
Map<Long, Block> newDataBlockIndex = new HashMap<>();
TimerUtil time = new TimerUtil();
// 1. get objects
CompletableFuture<List<S3ObjectMetadata>> getObjectsCf = objectManager.getObjects(streamId, nextLoadingOffset, endOffset, GET_OBJECT_STEP);
Expand All @@ -362,7 +375,6 @@ private CompletableFuture<Map<Long, Block>> loadMoreBlocksWithoutData(long endOf
// After object compaction, the blocks get from different objectManager#getObjects maybe not continuous.
throw new BlockNotContinuousException();
}
newDataBlockIndex.put(objectMetadata.objectId(), block);
nextFindStartOffset.set(streamDataBlock.getEndOffset());
}),
eventLoop
Expand All @@ -377,9 +389,9 @@ private CompletableFuture<Map<Long, Block>> loadMoreBlocksWithoutData(long endOf
return;
}
StorageOperationStats.getInstance().getIndicesTimeFindIndexStats.record(time.elapsedAs(TimeUnit.NANOSECONDS));
CompletableFuture<Map<Long, Block>> cf = inflightLoadIndexCf;
CompletableFuture<Void> cf = inflightLoadIndexCf;
inflightLoadIndexCf = null;
cf.complete(newDataBlockIndex);
cf.complete(null);
}, eventLoop);
return inflightLoadIndexCf;
}
Expand Down