Skip to content
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

tiny cleanups on BlockBlobSidecarsTrackersPoolImpl #8972

Merged
merged 1 commit into from
Jan 8, 2025
Merged

tiny cleanups on BlockBlobSidecarsTrackersPoolImpl #8972

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
29 changes: 15 additions & 14 deletions ...c/main/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,6 @@ public synchronized int getTotalBlobSidecarsTrackers() {
return blockBlobSidecarsTrackers.size();
}

@SuppressWarnings("FutureReturnValueIgnored")
private BlockBlobSidecarsTracker internalOnNewBlock(
final SignedBeaconBlock block, final Optional<RemoteOrigin> remoteOrigin) {
final SlotAndBlockRoot slotAndBlockRoot = block.getSlotAndBlockRoot();
Expand All @@ -502,19 +501,21 @@ private BlockBlobSidecarsTracker internalOnNewBlock(
if (!existingTracker.isComplete()) {
// we missed the opportunity to complete the blob sidecars via local EL and RPC
// (since the block is required to be known) Let's try now
asyncRunner.runAsync(
() ->
fetchMissingBlobsFromLocalEL(slotAndBlockRoot)
.handleException(this::logLocalElBlobsLookupFailure)
.thenRun(
() -> {
// only run if RPC block fetch has happened ( no blobs RPC fetch
// has occurred)
if (existingTracker.isRpcBlockFetchTriggered()) {
fetchMissingBlockOrBlobsFromRPC(slotAndBlockRoot);
}
})
.finish(this::logBlockOrBlobsRPCFailure));
asyncRunner
.runAsync(
() ->
fetchMissingBlobsFromLocalEL(slotAndBlockRoot)
.handleException(this::logLocalElBlobsLookupFailure)
.thenRun(
() -> {
// only run if RPC block fetch has happened
// (no blobs RPC fetch has occurred)
if (existingTracker.isRpcBlockFetchTriggered()) {
fetchMissingBlockOrBlobsFromRPC(slotAndBlockRoot);
}
})
.handleException(this::logBlockOrBlobsRPCFailure))
.ifExceptionGetsHereRaiseABug();
}
});

Expand Down
Loading