Additional fix for externalCL integration (prevent MDBX_MAP_FULL) #12922
+31
−85
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).GrowthStep(64 * datasize.MB).Open(ctx) | |||
There was a problem hiding this comment.
This reverts the change from the previous PR
AlexeyAkhunov
commented
Nov 29, 2024
| @@ -164,10 +162,11 @@ func (e *EngineBlockDownloader) waitForEndOfHeadersDownload(ctx context.Context) | |||
| } | |||
|
|
|||
| // waitForEndOfHeadersDownload waits until the download of headers ends and returns the outcome. | |||
| func (e *EngineBlockDownloader) loadDownloadedHeaders(tx kv.RwTx) (fromBlock uint64, toBlock uint64, fromHash libcommon.Hash, err error) { | |||
There was a problem hiding this comment.
return value fromHash will not be used, the function was changed accordingly
AlexeyAkhunov
commented
Nov 29, 2024
| @@ -238,66 +237,3 @@ func saveHeader(db kv.RwTx, header *types.Header, hash libcommon.Hash) error { | |||
| } | |||
| return nil | |||
| } | |||
|
|
|||
| func (e *EngineBlockDownloader) insertHeadersAndBodies(ctx context.Context, tx kv.Tx, fromBlock uint64, fromHash libcommon.Hash, toBlock uint64) error { | |||
There was a problem hiding this comment.
This function was removed, as its functionality was moved to the function downloadAndLoadBodiesSyncronously which now inserts blocks via the same API as Caplin, without the need to accumulate them in the tempDb (and potentially cause MDBX_MAP_FULL)
AlexeyAkhunov
commented
Nov 29, 2024
| @@ -102,11 +102,6 @@ func (e *EngineBlockDownloader) download(ctx context.Context, hashToDownload lib | |||
| return | |||
| } | |||
| tx.Rollback() // Discard the original db tx | |||
| if err := e.insertHeadersAndBodies(ctx, tmpTx, startBlock, startHash, endBlock); err != nil { | |||
There was a problem hiding this comment.
Call is removed, since insertion of blocks was performed in the call to downloadAndLoadBodiesSyncronously
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