Upstream: "core/rawdb: freezer batch write" #1908
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -213,8 +213,7 @@ type BlockChain struct { | |
| processor Processor // Block transaction processor interface | ||
| vmConfig vm.Config | ||
|
|
||
| shouldPreserve func(*types.Block) bool // Function used to determine whether should preserve the given block. | ||
| } | ||
|
|
||
| // NewBlockChain returns a fully initialised block chain using information | ||
|
|
@@ -1123,27 +1122,6 @@ const ( | |
| SideStatTy | ||
| ) | ||
|
|
||
| // numberHash is just a container for a number and a hash, to represent a block | ||
| type numberHash struct { | ||
| number uint64 | ||
|
|
@@ -1182,8 +1160,9 @@ func (bc *BlockChain) InsertReceiptChain(blockChain types.Blocks, receiptChain [ | |
| var ( | ||
| stats = struct{ processed, ignored int32 }{} | ||
| start = time.Now() | ||
| size = int64(0) | ||
| ) | ||
|
|
||
| // updateHead updates the head fast sync block if the inserted blocks are better | ||
| // and returns an indicator whether the inserted blocks are canonical. | ||
| updateHead := func(head *types.Block) bool { | ||
|
|
@@ -1204,120 +1183,116 @@ func (bc *BlockChain) InsertReceiptChain(blockChain types.Blocks, receiptChain [ | |
| } | ||
| return false | ||
| } | ||
|
|
||
| // writeAncient writes blockchain and corresponding receipt chain into ancient store. | ||
| // | ||
| // this function only accepts canonical chain data. All side chain will be reverted | ||
| // eventually. | ||
| writeAncient := func(blockChain types.Blocks, receiptChain []types.Receipts) (int, error) { | ||
| first := blockChain[0] | ||
| last := blockChain[len(blockChain)-1] | ||
|
|
||
| // Ensure genesis is in ancients. | ||
| if first.NumberU64() == 1 { | ||
| if frozen, _ := bc.db.Ancients(); frozen == 0 { | ||
| b := bc.genesisBlock | ||
| writeSize, err := rawdb.WriteAncientBlocks(bc.db, []*types.Block{b}, []types.Receipts{nil}, big.NewInt(1)) | ||
|
There was a problem hiding this comment. Given that There was a problem hiding this comment. @hbandura Is there an issue for this? |
||
| size += writeSize | ||
| if err != nil { | ||
| log.Error("Error writing genesis to ancients", "err", err) | ||
| return 0, err | ||
| } | ||
| log.Info("Wrote genesis to ancients") | ||
| } | ||
| } | ||
| // Before writing the blocks to the ancients, we need to ensure that | ||
| // they correspond to the what the headerchain 'expects'. | ||
| // We only check the last block/header, since it's a contiguous chain. | ||
| if !bc.HasHeader(last.Hash(), last.NumberU64()) { | ||
| return 0, fmt.Errorf("containing header #%d [%x..] unknown", last.Number(), last.Hash().Bytes()[:4]) | ||
| } | ||
|
|
||
| // Write all chain data to ancients. | ||
| td := bc.GetTd(first.Hash(), first.NumberU64()) | ||
| writeSize, err := rawdb.WriteAncientBlocks(bc.db, blockChain, receiptChain, td) | ||
| size += writeSize | ||
| if err != nil { | ||
| log.Error("Error importing chain data to ancients", "err", err) | ||
| return 0, err | ||
| } | ||
|
|
||
| // Write tx indices if any condition is satisfied: | ||
| // * If user requires to reserve all tx indices(txlookuplimit=0) | ||
| // * If all ancient tx indices are required to be reserved(txlookuplimit is even higher than ancientlimit) | ||
| // * If block number is large enough to be regarded as a recent block | ||
| // It means blocks below the ancientLimit-txlookupLimit won't be indexed. | ||
| // | ||
| // But if the `TxIndexTail` is not nil, e.g. Geth is initialized with | ||
| // an external ancient database, during the setup, blockchain will start | ||
| // a background routine to re-indexed all indices in [ancients - txlookupLimit, ancients) | ||
| // range. In this case, all tx indices of newly imported blocks should be | ||
| // generated. | ||
| var batch = bc.db.NewBatch() | ||
| for _, block := range blockChain { | ||
| if bc.txLookupLimit == 0 || ancientLimit <= bc.txLookupLimit || block.NumberU64() >= ancientLimit-bc.txLookupLimit { | ||
| rawdb.WriteTxLookupEntriesByBlock(batch, block) | ||
| } else if rawdb.ReadTxIndexTail(bc.db) != nil { | ||
| rawdb.WriteTxLookupEntriesByBlock(batch, block) | ||
| } | ||
| stats.processed++ | ||
| } | ||
|
|
||
| // Flush all tx-lookup index data. | ||
| size += int64(batch.ValueSize()) | ||
| if err := batch.Write(); err != nil { | ||
| // The tx index data could not be written. | ||
| // Roll back the ancient store update. | ||
| fastBlock := bc.CurrentFastBlock().NumberU64() | ||
| if err := bc.db.TruncateAncients(fastBlock + 1); err != nil { | ||
| log.Error("Can't truncate ancient store after failed insert", "err", err) | ||
| } | ||
| return 0, err | ||
| } | ||
|
|
||
| // Sync the ancient store explicitly to ensure all data has been flushed to disk. | ||
| if err := bc.db.Sync(); err != nil { | ||
| return 0, err | ||
| } | ||
|
|
||
| // Update the current fast block because all block data is now present in DB. | ||
| previousFastBlock := bc.CurrentFastBlock().NumberU64() | ||
| if !updateHead(blockChain[len(blockChain)-1]) { | ||
| // We end up here if the header chain has reorg'ed, and the blocks/receipts | ||
| // don't match the canonical chain. | ||
| if err := bc.db.TruncateAncients(previousFastBlock + 1); err != nil { | ||
| log.Error("Can't truncate ancient store after failed insert", "err", err) | ||
| } | ||
| return 0, errSideChainReceipts | ||
| } | ||
|
|
||
| // Delete block data from the main database. | ||
| batch.Reset() | ||
| canonHashes := make(map[common.Hash]struct{}) | ||
| for _, block := range blockChain { | ||
| canonHashes[block.Hash()] = struct{}{} | ||
| if block.NumberU64() == 0 { | ||
| continue | ||
| } | ||
| rawdb.DeleteCanonicalHash(batch, block.NumberU64()) | ||
| rawdb.DeleteBlockWithoutNumber(batch, block.Hash(), block.NumberU64()) | ||
| } | ||
| // Delete side chain hash-to-number mappings. | ||
| for _, nh := range rawdb.ReadAllHashesInRange(bc.db, first.NumberU64(), last.NumberU64()) { | ||
| if _, canon := canonHashes[nh.Hash]; !canon { | ||
| rawdb.DeleteHeader(batch, nh.Hash, nh.Number) | ||
| } | ||
| } | ||
| if err := batch.Write(); err != nil { | ||
| return 0, err | ||
| } | ||
| return 0, nil | ||
| } | ||
|
|
||
| // writeLive writes blockchain and corresponding receipt chain into active store. | ||
| writeLive := func(blockChain types.Blocks, receiptChain []types.Receipts) (int, error) { | ||
| skipPresenceCheck := false | ||
|
|
@@ -1355,7 +1330,7 @@ func (bc *BlockChain) InsertReceiptChain(blockChain types.Blocks, receiptChain [ | |
| if err := batch.Write(); err != nil { | ||
| return 0, err | ||
| } | ||
| size += int64(batch.ValueSize()) | ||
| batch.Reset() | ||
| } | ||
| stats.processed++ | ||
|
|
@@ -1364,14 +1339,15 @@ func (bc *BlockChain) InsertReceiptChain(blockChain types.Blocks, receiptChain [ | |
| // we can ensure all components of body is completed(body, receipts, | ||
| // tx indexes) | ||
| if batch.ValueSize() > 0 { | ||
| size += int64(batch.ValueSize()) | ||
| if err := batch.Write(); err != nil { | ||
| return 0, err | ||
| } | ||
| } | ||
| updateHead(blockChain[len(blockChain)-1]) | ||
| return 0, nil | ||
| } | ||
|
|
||
| // Write downloaded chain data and corresponding receipt chain data | ||
| if len(ancientBlocks) > 0 { | ||
| if n, err := writeAncient(ancientBlocks, ancientReceipts); err != nil { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This PR makes significant changes to
InsertReceiptChainbut it is also missing a test that was included in the upstream PRTestInsertReceiptChainRollback. Looking at the results of coverage I can see that none of the error cases ofinsertReceiptChainare executed so I think it would be good to include a test here that exercises some of the error cases forInsertReceiptChain.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The new test uses sidechains, which is why we can't run it. But the old test uses a test field/test mechanism "testInsert" to provoke the tests to be tested, which was removed in this refactor. The errors are tested using sidechains, which we don't have.
Re-adding the mechanism to make it testeable was probably a change that should be made in a different PR for the same reason you mentioned the redundant parameter one
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#1917