Fix externalcl integration for erigon3 #12906
Merged
Conversation
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
AlexeyAkhunov
commented
Nov 29, 2024
| @@ -37,7 +37,7 @@ func NewTemporaryMdbx(ctx context.Context, tempdir string) (kv.RwDB, error) { | |||
| return &TemporaryMdbx{}, err | |||
| } | |||
|
|
|||
| db, err := New(kv.ChainDB, log.Root()).InMem(path).Open(ctx) | |||
| db, err := New(kv.ChainDB, log.Root()).InMem(path).GrowthStep(64 * datasize.MB).Open(ctx) | |||
There was a problem hiding this comment.
Sometimes we get MDBX_MAP_FULL error if there are lots of blocks to hold temporarily, this is to fix it
AlexeyAkhunov
commented
Nov 29, 2024
| @@ -58,37 +56,7 @@ func (bd *BodyDownload) UpdateFromDb(db kv.Tx) (headHeight, headTime uint64, hea | |||
| clear(bd.requests) | |||
| clear(bd.peerMap) | |||
| bd.ClearBodyCache() | |||
| headHeight = bodyProgress | |||
There was a problem hiding this comment.
The following code was removed since it computes values that are never used. Also this code was actually producing error messages canonical marker not found specified in the issue
AlexeyAkhunov
commented
Nov 29, 2024
| @@ -79,9 +80,17 @@ func (e *EngineBlockDownloader) download(ctx context.Context, hashToDownload lib | |||
| memoryMutation := membatchwithdb.NewMemoryBatchWithCustomDB(tx, tmpDb, tmpTx) | |||
| defer memoryMutation.Rollback() | |||
|
|
|||
| if block != nil { | |||
| err = rawdb.WriteCanonicalHash(memoryMutation, block.Hash(), block.NumberU64()) | |||
There was a problem hiding this comment.
downloading of headers backwards starts with the parent of the block, so the block itself did not get its canonical hash written down. This addition fixes it
AlexeyAkhunov
commented
Nov 29, 2024
| @@ -235,7 +234,7 @@ func saveHeader(db kv.RwTx, header *types.Header, hash libcommon.Hash) error { | |||
| return fmt.Errorf("[saveHeader] failed to WriteTd: %w", err) | |||
| } | |||
| if err = rawdb.WriteCanonicalHash(db, hash, blockHeight); err != nil { | |||
| return fmt.Errorf("[saveHeader] failed to canonical hash: %w", err) | |||
| return fmt.Errorf("[saveHeader] failed to save canonical hash: %w", err) | |||
AlexeyAkhunov
commented
Nov 29, 2024
| startBlock, endBlock, startHash, err := e.loadDownloadedHeaders(memoryMutation) | ||
| if err != nil { | ||
| e.logger.Warn("[EngineBlockDownloader] Could load headers", "err", err) | ||
| e.logger.Warn("[EngineBlockDownloader] Could not load headers", "err", err) |
Giulio2002
approved these changes
Nov 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #12225