polygon/sync: fix issues found during testing #9873
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
battlmonstr
reviewed
Apr 8, 2024
| import "fmt" | ||
|
|
||
| func syncLogPrefix(message string) string { | ||
| return fmt.Sprintf("[sync] %s", message) |
There was a problem hiding this comment.
could this be solved by a new logger?
battlmonstr
reviewed
Apr 8, 2024
polygon/sync/sync.go
Outdated
| tip = newTip | ||
| } | ||
| var prevTip *types.Header | ||
| for tip != prevTip { // loop until we converge at latest checkpoint & milestone |
There was a problem hiding this comment.
is it because commitExecution is so slow that a new checkpoint might arrive?
nit: I prefer comments on a separate line
There was a problem hiding this comment.
yes, also other things can be slow - fetching headers, bodies, persisting the blocks - ie depending on timing by the time we finished iteration 1 there may be new checkpoints and milestones ready for us to fetch - btw this matches the initial spec design we have
battlmonstr
reviewed
Apr 8, 2024
polygon/sync/block_downloader.go
Outdated
| @@ -110,20 +108,37 @@ func (d *blockDownloader) downloadBlocksUsingWaypoints(ctx context.Context, wayp | |||
| return nil, nil | |||
| } | |||
|
|
|||
| d.logger.Info( | |||
battlmonstr
reviewed
Apr 8, 2024
polygon/sync/block_downloader.go
Outdated
| } | ||
|
|
||
| d.logger.Info(syncLogPrefix("finished downloading blocks using waypoints")) |
battlmonstr
reviewed
Apr 8, 2024
polygon/sync/storage.go
Outdated
| @@ -54,6 +58,8 @@ func (s *executionClientStorage) Flush(ctx context.Context) error { | |||
| } | |||
|
|
|||
| func (s *executionClientStorage) Run(ctx context.Context) error { | |||
| s.logger.Info(syncLogPrefix("running execution client storage component")) | |||
battlmonstr
reviewed
Apr 8, 2024
polygon/sync/sync.go
Outdated
| @@ -209,25 +221,36 @@ func (s *Sync) onNewBlockHashesEvent( | |||
| // | |||
|
|
|||
| func (s *Sync) Run(ctx context.Context) error { | |||
| s.logger.Info(syncLogPrefix("running sync component")) | |||
battlmonstr
reviewed
Apr 8, 2024
polygon/sync/tip_events.go
Outdated
| @@ -91,6 +94,8 @@ func (te *TipEvents) Events() <-chan Event { | |||
| } | |||
|
|
|||
| func (te *TipEvents) Run(ctx context.Context) error { | |||
| te.logger.Info(syncLogPrefix("running tip events component")) | |||
battlmonstr
approved these changes
Apr 8, 2024
battlmonstr
force-pushed
the
astrid-sync-testing-fixes
branch
from
be452b3
to
b12b070
Compare
Fixes problems found during bor-mainnet sync tests: * sync.Run was missing a for loop for initial sync convergences * temporarily disabling ForkChoiceUpdate execution since we are yet to solve and add missing state sync events and spans * no need to flush storage inside block downloader (better async performance) * logging improvements
battlmonstr
force-pushed
the
astrid-sync-testing-fixes
branch
from
b12b070
to
28013e1
Compare
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 problems found during bor-mainnet sync tests: