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

core: place a cap on reorglogs #25711

Merged
merged 9 commits into from
Sep 9, 2022
Merged

core: place a cap on reorglogs #25711

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4541e26
core: place a cap on reorglogs
holiman Sep 7, 2022
7af4ce7
core: don't discard reorg logs
holiman Sep 7, 2022
216583e
core: add test for rebirth log order
holiman Sep 8, 2022
70e29c2
Merge branch 'master' into cap_reorglogs
holiman Sep 8, 2022
2ec393a
core: update comments about events
fjl Sep 8, 2022
4169105
core: handle deleted logs in smaller batches
holiman Sep 9, 2022
45d1d22
core: minor refactor, send block-drop feed earlier
holiman Sep 9, 2022
6f8e937
core: more comment tweaks
fjl Sep 9, 2022
8be2fbf
core: go format
holiman Sep 9, 2022
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
23 changes: 13 additions & 10 deletions core/blockchain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2030,7 +2030,6 @@ func (bc *BlockChain) reorg(oldBlock, newBlock *types.Block) error {
addedTxs []common.Hash

deletedLogs [][]*types.Log
rebirthLogs [][]*types.Log
)
// Reduce the longer chain to the same number as the shorter one
if oldBlock.NumberU64() > newBlock.NumberU64() {
Expand Down Expand Up @@ -2151,23 +2150,27 @@ func (bc *BlockChain) reorg(oldBlock, newBlock *types.Block) error {
log.Crit("Failed to delete useless indexes", "err", err)
}

// Collect the logs
for i := len(newChain) - 1; i >= 1; i-- {
// Collect reborn logs due to chain reorg
logs := bc.collectLogs(newChain[i].Hash(), false)
if len(logs) > 0 {
rebirthLogs = append(rebirthLogs, logs)
}
}
// If any logs need to be fired, do it now. In theory we could avoid creating
// this goroutine if there are no events to fire, but realistcally that only
// ever happens if we're reorging empty blocks, which will only happen on idle
// networks where performance is not an issue either way.
if len(deletedLogs) > 0 {
rjl493456442 marked this conversation as resolved.
Show resolved Hide resolved
bc.rmLogsFeed.Send(RemovedLogsEvent{mergeLogs(deletedLogs, true)})
}
// Collect the logs
var rebirthLogs []*types.Log
for i := len(newChain) - 1; i >= 1; i-- {
// Collect reborn logs due to chain reorg
if logs := bc.collectLogs(newChain[i].Hash(), false); len(logs) > 0 {
rebirthLogs = append(rebirthLogs, logs...)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note for reviewer: I scrapped the append-then-use-mergeLogs, and just expanded the logs in-place immediately. I think it's done correctly

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have now fixed up the rebirth-log test, so I have now verified that it does indeed work as before

}
if len(rebirthLogs) > 1000 {
bc.logsFeed.Send(rebirthLogs)
rebirthLogs = make([]*types.Log, 0)
holiman marked this conversation as resolved.
Show resolved Hide resolved
}
}
if len(rebirthLogs) > 0 {
bc.logsFeed.Send(mergeLogs(rebirthLogs, false))
bc.logsFeed.Send(rebirthLogs)
}
if len(oldChain) > 0 {
for i := len(oldChain) - 1; i >= 0; i-- {
Expand Down