refactor: block on StopPrefetchers() instead of cleanup
#1396
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
darioush
reviewed
Nov 22, 2024
core/state/trie_prefetcher.libevm.go
Outdated
Comment on lines
75
to
84
| // Calling abort() sequentially may result in later fetchers accepting new | ||
| // work in the interim. | ||
| var wg sync.WaitGroup | ||
| for _, f := range p.fetchers { | ||
| wg.Add(1) | ||
| go func(f *subfetcher) { | ||
| f.abort() | ||
| wg.Done() | ||
| }(f) | ||
| } |
There was a problem hiding this comment.
I don't think this is needed, the user of triePrefetcher should not call prefetch after or concurrently with abort.
Also this doesn't guarantee the cancellation.
IMO we can remove this part, rename the fn to releaseWorkerPools() and call it after the sequential abort loop before line 109
There was a problem hiding this comment.
Agreed, it was YAGNI thinking on my part.
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.
If you use a shared
BoundedWorkersacross all tries1 then it's sufficient23 to block onStateDB.StopPrefetcher()or ontriePrefetcher.close()when you don't have a full DB.Footnotes
I think this is what we should be doing as it's the point of
BoundedWorkers. It's also what your original implementation had too. ↩There was a bug in my ordering of the
deferstatements at the top ofsubfetcher.loop(). I fixed it here; on my libevm branch I also added a test to prove thatStopPrefetcher()blocks untilWorkerPool.Wait()returns. ↩I (wrongly) assumed that
BoundedWorkerswould allow extra work whileWait()ing. ↩