Skip to content

SingleBockProviderFulu with soft and hard limit for sampled blocks #10533

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

Open
gfukushima wants to merge 24 commits into
base: master
Choose a base branch
from
Open

SingleBockProviderFulu with soft and hard limit for sampled blocks #10533

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
811317a
single-block-provider-fulu with soft and hard limit for sampled blocks
gfukushima Mar 26, 2026
cf749fe
spotless
gfukushima Mar 26, 2026
6295275
Merge branch 'master' into single-block-provider-fulu
gfukushima Mar 26, 2026
9d7c3c6
cursor review
gfukushima Mar 30, 2026
914d7bd
Merge branch 'master' into single-block-provider-fulu
gfukushima Mar 30, 2026
d8f21bf
add flag to modify default number of blocks to be sampled
gfukushima Mar 30, 2026
bad9e31
spotless
gfukushima Mar 30, 2026
ca49195
change config to minimum of 128 sampled blocks as this is what curren…
gfukushima Mar 31, 2026
5daa841
spotless
gfukushima Mar 31, 2026
bbde4b2
Merge branch 'master' into single-block-provider-fulu
gfukushima Mar 31, 2026
39304b1
added sampler back to recent block fetcher service
gfukushima Apr 9, 2026
0becf16
fix constructor in test class
gfukushima Apr 13, 2026
ba1926a
comments
gfukushima Apr 17, 2026
c05a6e2
revert metric change
gfukushima Apr 17, 2026
50e41fb
Merge branch 'master' into single-block-provider-fulu
gfukushima Apr 20, 2026
6b055b2
change back to store the block DataColumnSamplingTracker
gfukushima Apr 21, 2026
0af9b80
Merge branch 'master' into single-block-provider-fulu
gfukushima Apr 21, 2026
f424ca9
spotless
gfukushima Apr 21, 2026
e8fe9c2
add timestamp to tracker to use that when making room for new trackers
gfukushima Apr 21, 2026
5f5701d
spotless
gfukushima Apr 21, 2026
ccba0fc
Merge branch 'master' into single-block-provider-fulu
gfukushima May 4, 2026
056e068
Merge branch 'master' into single-block-provider-fulu
gfukushima May 5, 2026
79f7f1e
add comment and rename variable
gfukushima May 5, 2026
a0e55f9
Merge remote-tracking branch 'origin/single-block-provider-fulu' into…
gfukushima May 5, 2026
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
11 changes: 11 additions & 0 deletions beacon/sync/src/main/java/tech/pegasys/teku/beacon/sync/SyncConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ public class SyncConfig {
public static final int DEFAULT_FORWARD_SYNC_MAX_PENDING_BATCHES = 5;

/** Aligned with {@link P2PConfig#DEFAULT_PEER_BLOCKS_RATE_LIMIT} */
public static final int DEFAULT_MAX_RECENTLY_SAMPLED_BLOCKS = 64;

public static final int DEFAULT_FORWARD_SYNC_MAX_BLOCKS_PER_MINUTE = 500;

/** Aligned with {@link P2PConfig#DEFAULT_PEER_BLOB_SIDECARS_RATE_LIMIT} */
Expand All @@ -43,6 +45,7 @@ public class SyncConfig {
private final int forwardSyncMaxPendingBatches;
private final int forwardSyncMaxBlocksPerMinute;
private final int forwardSyncMaxBlobSidecarsPerMinute;
private final int maxRecentlySampledBlocks;
private final OptionalInt forwardSyncMaxDistanceFromHead;

private SyncConfig(
Expand All @@ -55,6 +58,7 @@ private SyncConfig(
final int forwardSyncMaxPendingBatches,
final int forwardSyncMaxBlocksPerMinute,
final int forwardSyncMaxBlobSidecarsPerMinute,
final int maxRecentlySampledBlocks,
final OptionalInt forwardSyncMaxDistanceFromHead) {
this.isEnabled = isEnabled;
this.isMultiPeerSyncEnabled = isMultiPeerSyncEnabled;
Expand All @@ -65,6 +69,7 @@ private SyncConfig(
this.forwardSyncMaxPendingBatches = forwardSyncMaxPendingBatches;
this.forwardSyncMaxBlocksPerMinute = forwardSyncMaxBlocksPerMinute;
this.forwardSyncMaxBlobSidecarsPerMinute = forwardSyncMaxBlobSidecarsPerMinute;
this.maxRecentlySampledBlocks = maxRecentlySampledBlocks;
this.forwardSyncMaxDistanceFromHead = forwardSyncMaxDistanceFromHead;
}

Expand Down Expand Up @@ -108,6 +113,10 @@ public int getForwardSyncMaxBlobSidecarsPerMinute() {
return forwardSyncMaxBlobSidecarsPerMinute;
}

public int getMaxRecentlySampledBlocks() {
return maxRecentlySampledBlocks;
}

public OptionalInt getForwardSyncMaxDistanceFromHead() {
return forwardSyncMaxDistanceFromHead;
}
Expand All @@ -123,6 +132,7 @@ public static class Builder {
private Integer forwardSyncMaxBlocksPerMinute = DEFAULT_FORWARD_SYNC_MAX_BLOCKS_PER_MINUTE;
private Integer forwardSyncMaxBlobSidecarsPerMinute =
DEFAULT_FORWARD_SYNC_MAX_BLOB_SIDECARS_PER_MINUTE;
private final Integer maxRecentlySampledBlocks = DEFAULT_MAX_RECENTLY_SAMPLED_BLOCKS;
Comment thread
cursor[bot] marked this conversation as resolved.
Outdated
private OptionalInt forwardSyncMaxDistanceFromHead = OptionalInt.empty();

private Builder() {}
Expand All @@ -139,6 +149,7 @@ public SyncConfig build() {
forwardSyncMaxPendingBatches,
forwardSyncMaxBlocksPerMinute,
forwardSyncMaxBlobSidecarsPerMinute,
maxRecentlySampledBlocks,
forwardSyncMaxDistanceFromHead);
}

Expand Down
10 changes: 6 additions & 4 deletions ...erenceTest/java/tech/pegasys/teku/reference/phase0/forkchoice/ForkChoiceTestExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
import tech.pegasys.teku.spec.logic.common.util.AsyncBLSSignatureVerifier;
import tech.pegasys.teku.statetransition.datacolumns.CurrentSlotProvider;
import tech.pegasys.teku.statetransition.datacolumns.DasCustodyStand;
import tech.pegasys.teku.statetransition.datacolumns.DasSamplerBasic;
import tech.pegasys.teku.statetransition.datacolumns.DasSamplerBasicImpl;
import tech.pegasys.teku.statetransition.datacolumns.DataColumnSidecarRecoveringCustody;
import tech.pegasys.teku.statetransition.datacolumns.retriever.DataColumnSidecarRetrieverStub;
import tech.pegasys.teku.statetransition.forkchoice.ForkChoice;
Expand Down Expand Up @@ -161,8 +161,8 @@ spec, new SignedBlockAndState(anchorBlock, anchorState)),
final StubBlobSidecarManager blobSidecarManager = new StubBlobSidecarManager(kzg);
final CurrentSlotProvider currentSlotProvider =
CurrentSlotProvider.create(spec, recentChainData.getStore());
final DasSamplerBasic dasSampler =
new DasSamplerBasic(
final DasSamplerBasicImpl dasSampler =
new DasSamplerBasicImpl(
spec,
asyncRunnerFactory.create("das", 1),
currentSlotProvider,
Expand All @@ -173,7 +173,9 @@ spec, new SignedBlockAndState(anchorBlock, anchorState)),
// and fetching from the config would break when not in fulu
DasCustodyStand.createCustodyGroupCountManager(4, 8),
recentChainData,
false);
false,
new StubMetricsSystem(),
64);
final StubDataColumnSidecarManager dataColumnSidecarManager =
new StubDataColumnSidecarManager(spec, recentChainData, dasSampler);
// forkChoiceLateBlockReorgEnabled is true here always because this is the reference test
Expand Down
Loading
Loading