mirror of
https://gitlab.com/pulsechaincom/erigon-pulse.git
synced 2024-12-23 12:07:17 +00:00
cmd/utils: skip batches with known blocks during import
This makes block importing restartable.
This commit is contained in:
parent
67effb94b6
commit
a8bc2181c9
@ -204,12 +204,11 @@ func ImportChain(chain *core.ChainManager, fn string) error {
|
|||||||
defer fh.Close()
|
defer fh.Close()
|
||||||
stream := rlp.NewStream(fh, 0)
|
stream := rlp.NewStream(fh, 0)
|
||||||
|
|
||||||
// Remove all existing blocks and start the import.
|
// Run actual the import.
|
||||||
chain.Reset()
|
|
||||||
batchSize := 2500
|
batchSize := 2500
|
||||||
blocks := make(types.Blocks, batchSize)
|
blocks := make(types.Blocks, batchSize)
|
||||||
n := 0
|
n := 0
|
||||||
for {
|
for batch := 0; ; batch++ {
|
||||||
// Load a batch of RLP blocks.
|
// Load a batch of RLP blocks.
|
||||||
if checkInterrupt() {
|
if checkInterrupt() {
|
||||||
return fmt.Errorf("interrupted")
|
return fmt.Errorf("interrupted")
|
||||||
@ -232,6 +231,11 @@ func ImportChain(chain *core.ChainManager, fn string) error {
|
|||||||
if checkInterrupt() {
|
if checkInterrupt() {
|
||||||
return fmt.Errorf("interrupted")
|
return fmt.Errorf("interrupted")
|
||||||
}
|
}
|
||||||
|
if hasAllBlocks(chain, blocks[:i]) {
|
||||||
|
glog.Infof("skipping batch %d, all blocks present [%x / %x]",
|
||||||
|
batch, blocks[0].Hash().Bytes()[:4], blocks[i-1].Hash().Bytes()[:4])
|
||||||
|
continue
|
||||||
|
}
|
||||||
if _, err := chain.InsertChain(blocks[:i]); err != nil {
|
if _, err := chain.InsertChain(blocks[:i]); err != nil {
|
||||||
return fmt.Errorf("invalid block %d: %v", n, err)
|
return fmt.Errorf("invalid block %d: %v", n, err)
|
||||||
}
|
}
|
||||||
@ -239,6 +243,15 @@ func ImportChain(chain *core.ChainManager, fn string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func hasAllBlocks(chain *core.ChainManager, bs []*types.Block) bool {
|
||||||
|
for _, b := range bs {
|
||||||
|
if !chain.HasBlock(b.Hash()) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
func ExportChain(chainmgr *core.ChainManager, fn string) error {
|
func ExportChain(chainmgr *core.ChainManager, fn string) error {
|
||||||
glog.Infoln("Exporting blockchain to", fn)
|
glog.Infoln("Exporting blockchain to", fn)
|
||||||
fh, err := os.OpenFile(fn, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, os.ModePerm)
|
fh, err := os.OpenFile(fn, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, os.ModePerm)
|
||||||
|
Loading…
Reference in New Issue
Block a user