eth/downloader: fix race condition in tests #22140
Merged
Conversation
This file contains hidden or 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
ziogaschr
requested review from
holiman,
karalabe and
rjl493456442
as code owners
|
Hm. I don't see how this fixes any race -- do you have any more context, e.g. from the race detector? |
|
Sorry @holiman that I haven't added the initial error. The actual point where the race is being occurred is https://github.com/ethereum/go-ethereum/blob/master/eth/downloader/downloader.go#L387-L389 Traceback from master branch follows: |
fjl
changed the title
|
The CI's failing tests doesn't seem to be related to this change. |
|
Based on the output from that race detector, it seems to me that this would be a more accurate fix: diff --git a/eth/downloader/downloader_test.go b/eth/downloader/downloader_test.go
index 6578275d0c..5de1ef3f8e 100644
--- a/eth/downloader/downloader_test.go
+++ b/eth/downloader/downloader_test.go
@@ -584,14 +584,15 @@ func testThrottling(t *testing.T, protocol uint, mode SyncMode) {
time.Sleep(25 * time.Millisecond)
tester.lock.Lock()
+ tester.downloader.queue.lock.Lock()
+ tester.downloader.queue.resultCache.lock.Lock()
{
- tester.downloader.queue.resultCache.lock.Lock()
cached = tester.downloader.queue.resultCache.countCompleted()
- tester.downloader.queue.resultCache.lock.Unlock()
frozen = int(atomic.LoadUint32(&blocked))
retrieved = len(tester.ownBlocks)
-
}
+ tester.downloader.queue.resultCache.lock.Unlock()
+ tester.downloader.queue.lock.Unlock()
tester.lock.Unlock()
if cached == blockCacheMaxItems || |
|
Thanks @holiman. I am wondering if you agree that it makes sense to also leave my initial commit, as it mimics how the |
I don't know, I don't really see any reason for it, but I can be convinced... Does not allocating the sync bloom make the tests run any faster? I would probably prefer to leave the bulk of the code untouched if there's no really solid reason to change it |
|
No, I don't have a solid reason for it. I will revert the commit and feel free to squash merge it :) |
This reverts commit 108033e.
9 tasks
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.
Running this cmd:
was giving race condition issues.
This PR fixes the minor race condition in the tests.