Can retrieve cached initial sync block and db block #10568
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
terencechain
added
Ready For Review
Priority: High
terencechain
changed the title
terencechain
changed the title
nisdas
reviewed
Apr 28, 2022
| @@ -182,9 +182,14 @@ func (s *Service) notifyEngineIfChangedHead(ctx context.Context, newHeadRoot [32 | |||
| log.WithError(errNilFinalizedInStore).Error("could not get finalized checkpoint") | |||
| return | |||
| } | |||
| newHeadBlock, err := s.cfg.BeaconDB.Block(ctx, newHeadRoot) | |||
| if err := s.cfg.BeaconDB.SaveBlocks(ctx, s.getInitSyncBlocks()); err != nil { | |||
There was a problem hiding this comment.
if we pass in 0 blocks, do we still write to the db ? I think SaveBlocks should exit early if there is nothing to write.
There was a problem hiding this comment.
I think I will just remove it. This was from the previous solution. Now getBlock should take care of it. Doesn't seem right to Save cached blocks here
nisdas
previously approved these changes
Apr 28, 2022
Comment on lines
33
to
36
| defer s.initSyncBlocksLock.RUnlock() | ||
| b := s.initSyncBlocks[r] | ||
| return b | ||
|
|
||
| // Check cache first because it's faster. | ||
| b, ok := s.initSyncBlocks[r] |
There was a problem hiding this comment.
I think you can release the read lock immediately after the map read. In the case that there is a cache miss, you are holding the read lock for longer than necessary
| @@ -438,7 +438,7 @@ func TestVerifyBeaconBlock_NoBlock(t *testing.T) { | |||
| require.NoError(t, err) | |||
|
|
|||
| d := util.HydrateAttestationData(ðpb.AttestationData{}) | |||
| assert.ErrorContains(t, "signed beacon block can't be nil", service.verifyBeaconBlock(ctx, d)) | |||
| assert.ErrorContains(t, "block not found in cache or db", service.verifyBeaconBlock(ctx, d)) | |||
There was a problem hiding this comment.
Use errBlockNotFoundInCacheOrDB here
…m into save-cached-init-blks
Co-authored-by: Preston Van Loon <preston@prysmaticlabs.com>
nisdas
previously approved these changes
Apr 28, 2022
…m into save-cached-init-blks
…m into save-cached-init-blks
nisdas
approved these changes
Apr 29, 2022
prestonvanloon
pushed a commit
that referenced
this pull request
Apr 29, 2022
* Save cached initial sync blocks before getting head block * Add better abstraction to get block * Move unlock read to a better location * Feedbacks * Add head changed logging * Harder hasBlock requirement * Update beacon-chain/blockchain/service.go Co-authored-by: Preston Van Loon <preston@prysmaticlabs.com> * Update receive_attestation.go * Don't process head if the block is unknown * Use a helper method * Fix test Co-authored-by: Nishant Das <nishdas93@gmail.com> Co-authored-by: Preston Van Loon <preston@prysmaticlabs.com> Co-authored-by: Raul Jordan <raul@prysmaticlabs.com> (cherry picked from commit b7a82d0)
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.
This fixes #10570
To improve on previous behavior, we adopted a new
getBlockmethod which retrieves blocks in the initial syncing cacher DB and returns an error not found if the block is nil. We applygetBlockto more than one occurrence which adopted similar patterns. This is a much nicer clean-up than before.Ideally, the initial syncing cache really should belong inside DB package but that's a much more heavily refactor and will induce more risk. I'm incline to push this to the later