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: separated databases for block data #2227

Merged
merged 10 commits into from
Apr 18, 2024
Merged

core: separated databases for block data #2227

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e25ae29
core: use finalized block as the chain freeze indicator (#28683)
rjl493456442 Mar 4, 2024
e98300a
core: impl multi database for block data
jingjunLi Mar 12, 2024
06a287b
core: fix db inspect total size bug
jingjunLi Mar 13, 2024
b1e7be8
core: add tips for user who use multi-database
jingjunLi Mar 18, 2024
4621040
core: adapt some cmd for multi-database
jingjunLi Mar 12, 2024
04e273b
core: fix some code conflict
jingjunLi Apr 2, 2024
cbb28d4
core: adapter blockBlobSidecars
jingjunLi Apr 3, 2024
f523497
core: fix freezer readHeader bug
jingjunLi Apr 7, 2024
1fc6c53
core: refine code
jingjunLi Apr 15, 2024
fb15b37
core: refine code
jingjunLi Apr 15, 2024
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
Prev Previous commit
Next Next commit
core: fix some code conflict
  • Loading branch information
@jingjunLi
jingjunLi committed Apr 16, 2024
commit 04e273b1e0bcbfb44987b89c82bee67c2af3e29e
4 changes: 2 additions & 2 deletions core/blockchain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1717,9 +1717,9 @@ func (bc *BlockChain) writeBlockWithoutState(block *types.Block, td *big.Int) (e
rawdb.WriteBlock(blockBatch, block)
// if cancun is enabled, here need to write sidecars too
if bc.chainConfig.IsCancun(block.Number(), block.Time()) {
rawdb.WriteBlobSidecars(batch, block.Hash(), block.NumberU64(), block.Sidecars())
rawdb.WriteBlobSidecars(blockBatch, block.Hash(), block.NumberU64(), block.Sidecars())
}
if err := batch.Write(); err != nil {
if err := blockBatch.Write(); err != nil {
log.Crit("Failed to write block into disk", "err", err)
}
return nil
Expand Down
8 changes: 6 additions & 2 deletions core/rawdb/chain_freezer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"fmt"
"math/big"
"sync"
"sync/atomic"
"time"

"github.com/ethereum/go-ethereum/rlp"
Expand Down Expand Up @@ -184,6 +185,9 @@ func (f *chainFreezer) freeze(db ethdb.KeyValueStore) {
continue
}

headNum := f.readHeadNumber(db)
hash := ReadHeadBlockHash(nfdb)
head := ReadHeader(nfdb, hash, headNum)
threshold, err := f.freezeThreshold(nfdb)
if err != nil {
backoff = true
Expand All @@ -208,7 +212,7 @@ func (f *chainFreezer) freeze(db ethdb.KeyValueStore) {
last = freezerBatchLimit + first - 1
}

ancients, err := f.freezeRangeWithBlobs(nfdb, first, limit)
ancients, err := f.freezeRangeWithBlobs(nfdb, first, last)
if err != nil {
log.Error("Error in block freeze operation", "err", err)
backoff = true
Expand Down Expand Up @@ -296,7 +300,7 @@ func (f *chainFreezer) freeze(db ethdb.KeyValueStore) {
env, _ := f.freezeEnv.Load().(*ethdb.FreezerEnv)
// try prune blob data after cancun fork
if isCancun(env, head.Number, head.Time) {
f.tryPruneBlobAncientTable(env, *number)
f.tryPruneBlobAncientTable(env, headNum)
}

// Avoid database thrashing with tiny writes
Expand Down