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

[R4R]fix: block fetcher efficiency #333

Merged
merged 1 commit into from
Jul 29, 2021
Merged

[R4R]fix: block fetcher efficiency #333

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
44 changes: 36 additions & 8 deletions eth/fetcher/block_fetcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,12 @@ import (
)

const (
lightTimeout = time.Millisecond // Time allowance before an announced header is explicitly requested
arriveTimeout = 500 * time.Millisecond // Time allowance before an announced block/transaction is explicitly requested
gatherSlack = 100 * time.Millisecond // Interval used to collate almost-expired announces with fetches
fetchTimeout = 5 * time.Second // Maximum allotted time to return an explicitly requested block/transaction
lightTimeout = time.Millisecond // Time allowance before an announced header is explicitly requested
arriveTimeout = 500 * time.Millisecond // Time allowance before an announced block/transaction is explicitly requested
gatherSlack = 100 * time.Millisecond // Interval used to collate almost-expired announces with fetches
fetchTimeout = 5 * time.Second // Maximum allotted time to return an explicitly requested block/transaction
reQueueBlockTimeout = 500 * time.Millisecond // Time allowance before blocks are requeued for import

)

const (
Expand Down Expand Up @@ -166,6 +168,8 @@ type BlockFetcher struct {
done chan common.Hash
quit chan struct{}

requeue chan *blockOrHeaderInject
j75689 marked this conversation as resolved.
Show resolved Hide resolved

// Announce states
announces map[string]int // Per peer blockAnnounce counts to prevent memory exhaustion
announced map[common.Hash][]*blockAnnounce // Announced blocks, scheduled for fetching
Expand Down Expand Up @@ -206,6 +210,7 @@ func NewBlockFetcher(light bool, getHeader HeaderRetrievalFn, getBlock blockRetr
bodyFilter: make(chan chan *bodyFilterTask),
done: make(chan common.Hash),
quit: make(chan struct{}),
requeue: make(chan *blockOrHeaderInject),
announces: make(map[string]int),
announced: make(map[common.Hash][]*blockAnnounce),
fetching: make(map[common.Hash]*blockAnnounce),
Expand Down Expand Up @@ -370,9 +375,9 @@ func (f *BlockFetcher) loop() {
continue
}
if f.light {
f.importHeaders(op.origin, op.header)
f.importHeaders(op)
} else {
f.importBlocks(op.origin, op.block)
f.importBlocks(op)
}
}
// Wait for an outside event to occur
Expand Down Expand Up @@ -415,6 +420,21 @@ func (f *BlockFetcher) loop() {
f.rescheduleFetch(fetchTimer)
}

case op := <-f.requeue:
// Re-queue blocks that have not been written due to fork block competition
j75689 marked this conversation as resolved.
Show resolved Hide resolved
number := int64(0)
hash := ""
if op.header != nil {
number = op.header.Number.Int64()
hash = op.header.Hash().String()
} else if op.block != nil {
number = op.block.Number().Int64()
hash = op.block.Hash().String()
}

log.Info("Re-queue blocks", "number", number, "hash", hash)
f.enqueue(op.origin, op.header, op.block)

case op := <-f.inject:
// A direct block insertion was requested, try and fill any pending gaps
blockBroadcastInMeter.Mark(1)
Expand Down Expand Up @@ -750,7 +770,9 @@ func (f *BlockFetcher) enqueue(peer string, header *types.Header, block *types.B
// importHeaders spawns a new goroutine to run a header insertion into the chain.
// If the header's number is at the same height as the current import phase, it
// updates the phase states accordingly.
func (f *BlockFetcher) importHeaders(peer string, header *types.Header) {
func (f *BlockFetcher) importHeaders(op *blockOrHeaderInject) {
peer := op.origin
header := op.header
hash := header.Hash()
log.Debug("Importing propagated header", "peer", peer, "number", header.Number, "hash", hash)

Expand All @@ -760,6 +782,8 @@ func (f *BlockFetcher) importHeaders(peer string, header *types.Header) {
parent := f.getHeader(header.ParentHash)
if parent == nil {
log.Debug("Unknown parent of propagated header", "peer", peer, "number", header.Number, "hash", hash, "parent", header.ParentHash)
time.Sleep(reQueueBlockTimeout)
f.requeue <- op
j75689 marked this conversation as resolved.
Show resolved Hide resolved
return
}
// Validate the header and if something went wrong, drop the peer
Expand All @@ -783,7 +807,9 @@ func (f *BlockFetcher) importHeaders(peer string, header *types.Header) {
// importBlocks spawns a new goroutine to run a block insertion into the chain. If the
// block's number is at the same height as the current import phase, it updates
// the phase states accordingly.
func (f *BlockFetcher) importBlocks(peer string, block *types.Block) {
func (f *BlockFetcher) importBlocks(op *blockOrHeaderInject) {
peer := op.origin
block := op.block
hash := block.Hash()

// Run the import on a new thread
Expand All @@ -795,6 +821,8 @@ func (f *BlockFetcher) importBlocks(peer string, block *types.Block) {
parent := f.getBlock(block.ParentHash())
if parent == nil {
log.Debug("Unknown parent of propagated block", "peer", peer, "number", block.Number(), "hash", hash, "parent", block.ParentHash())
j75689 marked this conversation as resolved.
Show resolved Hide resolved
time.Sleep(reQueueBlockTimeout)
f.requeue <- op
return
}
// Quickly validate the header and propagate the block if it passes
Expand Down