Skip to content
Merged
Changes from all commits
Commits
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
15 changes: 10 additions & 5 deletions internal/orchestrator/poller.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ func NewPoller(rpc rpc.IRPCClient, storage storage.IStorage, opts ...PollerOptio
}

var ErrNoNewBlocks = fmt.Errorf("no new blocks to poll")
var ErrBlocksProcessed = fmt.Errorf("blocks are being processed")

func (p *Poller) Start(ctx context.Context) {
log.Debug().Msgf("Poller running with %d workers", p.parallelPollers)
Expand Down Expand Up @@ -118,7 +119,7 @@ func (p *Poller) poll(ctx context.Context, blockNumbers []*big.Int) ([]common.Bl
p.processingRangesMutex.RUnlock()

if isProcessing {
return nil, fmt.Errorf("range %s already being processed", rangeKey)
return nil, ErrBlocksProcessed
}

p.markRangeAsProcessing(rangeKey)
Expand Down Expand Up @@ -167,7 +168,9 @@ func (p *Poller) Request(ctx context.Context, blockNumbers []*big.Int) []common.
// Process and cache the requested range
blockData, err := p.poll(ctx, blockNumbers)
if err != nil {
log.Error().Err(err).Msg("Failed to poll blocks")
if err != ErrBlocksProcessed && err != ErrNoNewBlocks {
log.Error().Err(err).Msgf("Error polling requested blocks: %s - %s", blockNumbers[0].String(), endBlock.String())
}
return nil
}

Expand Down Expand Up @@ -265,9 +268,11 @@ func (p *Poller) processBatch(blockNumbers []*big.Int) {

_, err := p.poll(p.ctx, blockNumbers)
if err != nil {
if len(blockNumbers) > 0 {
startBlock, endBlock := blockNumbers[0], blockNumbers[len(blockNumbers)-1]
log.Debug().Err(err).Msgf("Failed to poll blocks %s-%s", startBlock.String(), endBlock.String())
if err != ErrBlocksProcessed && err != ErrNoNewBlocks {
if len(blockNumbers) > 0 {
startBlock, endBlock := blockNumbers[0], blockNumbers[len(blockNumbers)-1]
log.Debug().Err(err).Msgf("Failed to poll blocks %s-%s", startBlock.String(), endBlock.String())
}
}
return
}
Expand Down