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

Jump to bottom

feat(cannon): Wrap GetBeaconBlock in a semaphore #201

Merged
merged 2 commits into from
Sep 22, 2023
Merged

feat(cannon): Wrap GetBeaconBlock in a semaphore #201

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8d8eba
feat(cannon): Wrap GetBeaconBlock in a semaphore
samcm Sep 22, 2023
2fd2f7d
refactor: Improve GetBeaconBlock function's concurrency limit
samcm Sep 22, 2023
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
33 changes: 19 additions & 14 deletions pkg/cannon/ethereum/beacon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,21 +203,30 @@ func (b *BeaconNode) Synced(ctx context.Context) error {

// GetBeaconBlock returns a beacon block by its identifier. Blocks can be cached internally.
func (b *BeaconNode) GetBeaconBlock(ctx context.Context, identifier string, ignoreMetrics ...bool) (*spec.VersionedSignedBeaconBlock, error) {
// Use singleflight to ensure we only make one request for a block at a time.
x, err, _ := b.sfGroup.Do(identifier, func() (interface{}, error) {
// Check the cache first.
if item := b.blockCache.Get(identifier); item != nil {
if len(ignoreMetrics) != 0 && ignoreMetrics[0] {
b.metrics.IncBlockCacheHit(string(b.Metadata().Network.Name))
}
b.metrics.IncBlocksFetched(string(b.Metadata().Network.Name))

return item.Value(), nil
}
// Create a buffered channel (semaphore) to limit the number of concurrent goroutines.
sem := make(chan struct{}, b.config.BlockPreloadWorkers)

// Check the cache first.
if item := b.blockCache.Get(identifier); item != nil {
if len(ignoreMetrics) != 0 && ignoreMetrics[0] {
b.metrics.IncBlockCacheMiss(string(b.Metadata().Network.Name))
b.metrics.IncBlockCacheHit(string(b.Metadata().Network.Name))
}

return item.Value(), nil
}

if len(ignoreMetrics) != 0 && ignoreMetrics[0] {
b.metrics.IncBlockCacheMiss(string(b.Metadata().Network.Name))
}

// Use singleflight to ensure we only make one request for a block at a time.
x, err, _ := b.sfGroup.Do(identifier, func() (interface{}, error) {
// Acquire a semaphore before proceeding.
sem <- struct{}{}
defer func() { <-sem }()

// Not in the cache, so fetch it.
block, err := b.beacon.FetchBlock(ctx, identifier)
if err != nil {
Expand All @@ -237,10 +246,6 @@ func (b *BeaconNode) GetBeaconBlock(ctx context.Context, identifier string, igno
return nil, err
}

if len(ignoreMetrics) != 0 && ignoreMetrics[0] {
b.metrics.IncBlocksFetched(string(b.Metadata().Network.Name))
}

return x.(*spec.VersionedSignedBeaconBlock), nil
}

Expand Down
Loading