always close cache warm chan to prevent blocking #14080
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
kasey
requested review from
rauljordan,
terencechain,
rkapka,
prestonvanloon and
saolyn
james-prysm
reviewed
Jun 4, 2024
| @@ -93,13 +93,15 @@ func windowMin(latest, offset primitives.Slot) primitives.Slot { | |||
| func (p *blobPruner) warmCache() error { | |||
| p.Lock() | |||
| defer p.Unlock() | |||
| defer func() { | |||
There was a problem hiding this comment.
does the order of the defer above for unlock matter? I suppose if it unlocks here this other defer is updating p.warmed without the lock?
There was a problem hiding this comment.
defers are always LIFO, so this code is correct (unlock happens after the channel is closed). But, I did anticipate this might confuse someone and thought about putting the unlock in the other deferred function, so I think I'll go ahead and do that.
prestonvanloon
previously approved these changes
Jun 4, 2024
james-prysm
previously approved these changes
Jun 4, 2024
james-prysm
approved these changes
Jun 4, 2024
prestonvanloon
pushed a commit
that referenced
this pull request
Jun 5, 2024
* always close cache warm chan to prevent blocking * test that waitForCache does not block * combine defers to reduce cognitive overhead * lint --------- Co-authored-by: Kasey Kirkham <kasey@users.noreply.github.com>
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.
What type of PR is this?
Bug fix
What does this PR do? Why is it needed?
5.0.4-rc.1has a bug where invalid blobs in blob storage can cause the cache warmup code to fail to close the channel which other users of the cache wait on to indicate the cache is ready. This results in initial-sync (which does not use a timeout when requesting the cache) to hang indefinitely if there are truncated blobs in storage.This PR fixes the issue by ensuring the sentinel channel is always closed, even if the cache warmup call to the pruning func produces an error.