polygon/bridge: fix bridge integration in stage mode #11646
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
Member
taratorio
commented
Aug 16, 2024
•
taratorio
commented
- fixes bridge breaks astrid stage integration #11705
- fixes restarts - bridge starting from where it left off previously
- fixes starts from snapshots - when the bridge is run as part of the astrid stage integration
shohamc1
reviewed
Aug 19, 2024
…ge-synchronisation-fix
…tech/erigon into astrid-bridge-synchronisation-fix
…watch/erigon into astrid-bridge-synchronisation-fix
…e-synchronisation-fix
This reverts commit 9d3c54b.
…ge-synchronisation-fix
…ge-synchronisation-fix
…ge-synchronisation-fix
taratorio
changed the title
antonis19
reviewed
Aug 23, 2024
Comment on lines
+75
to
+97
| epbCursor, err := tx.RwCursor(kv.BorEventProcessedBlocks) | ||
| if err != nil { | ||
| return deleted, err | ||
| } | ||
|
|
||
| defer epbCursor.Close() | ||
| counter = blocksDeleteLimit | ||
| for k, _, err = epbCursor.First(); err == nil && k != nil && counter > 0; k, _, err = epbCursor.Next() { | ||
| blockNum := binary.BigEndian.Uint64(k) | ||
| if blockNum >= blockTo { | ||
| break | ||
| } | ||
|
|
||
| if err = epbCursor.DeleteCurrent(); err != nil { | ||
| return deleted, err | ||
| } | ||
|
|
||
| deleted++ | ||
| counter-- | ||
| } | ||
| if err != nil { | ||
| return deleted, err | ||
| } |
There was a problem hiding this comment.
This can be extracted into a sub-function.
antonis19
reviewed
Aug 23, 2024
| return deleted, err | ||
| } | ||
|
|
||
| // spans |
There was a problem hiding this comment.
Can be extracted to a DeleteSpans function.
antonis19
reviewed
Aug 23, 2024
| @@ -30,6 +30,7 @@ import ( | |||
| // doesn't change sequences of kv.EthTx | |||
| // doesn't delete Receipts, Senders, Canonical markers, TotalDifficulty | |||
| func PruneBorBlocks(tx kv.RwTx, blockTo uint64, blocksDeleteLimit int, SpanIdAt func(number uint64) uint64) (deleted int, err error) { | |||
There was a problem hiding this comment.
Can you explain the return value also? Is deleted the total number of objects deleted?
antonis19
reviewed
Aug 23, 2024
| @@ -88,6 +115,9 @@ func PruneBorBlocks(tx kv.RwTx, blockTo uint64, blocksDeleteLimit int, SpanIdAt | |||
| deleted++ | |||
| counter-- | |||
| } | |||
| if err != nil { | |||
| return deleted, err | |||
| } | |||
|
|
|||
| if snaptype.CheckpointsEnabled() { | |||
| checkpointCursor, err := tx.RwCursor(kv.BorCheckpoints) | |||
There was a problem hiding this comment.
I know this isn't part or purpose of the PR, but since this function is a bit long, you could split it into smaller sub-functions each deleting from a certain table.
antonis19
reviewed
Aug 23, 2024
Comment on lines
+71
to
+73
| fetchedEventsSignal chan struct{} | ||
| lastFetchedEventTime atomic.Uint64 | ||
| processedBlocksSignal chan struct{} |
There was a problem hiding this comment.
Could you add a small description about what these signals are for?
mh0lt
approved these changes
Aug 24, 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.