internal/fuzz: fix race between context deadline and error suppression#79199
Open
klauspost wants to merge 1 commit intogolang:masterfrom
Open
internal/fuzz: fix race between context deadline and error suppression#79199klauspost wants to merge 1 commit intogolang:masterfrom
klauspost wants to merge 1 commit intogolang:masterfrom
Conversation
When the coordinator's context deadline expires, there is a brief window where ctx.Err() is set but fuzzCtx (a child context) has not yet been canceled. If the coordinator's event loop observes <-doneC during this window, the stop function compares the error against fuzzCtx.Err() which is still nil, so the deadline error is not suppressed and leaks out as a spurious test failure. Fix this by also comparing against ctx.Err() in the suppression check. ctx.Err() is guaranteed to be set before ctx.Done() is closed because cancelCtx.cancel stores the error before closing the done channel. Fixes golang#75804 Change-Id: Ifa83b68d6de2bf474764bb3565c00e40752f8d81
Contributor
|
This PR (HEAD: a99ddf6) has been imported to Gerrit for code review. Please visit Gerrit at https://go-review.googlesource.com/c/go/+/774140. Important tips:
|
Contributor
|
Message from Gopher Robot: Patch Set 1: (1 comment) Please don’t reply on this GitHub thread. Visit golang.org/cl/774140. |
Contributor
|
Message from Klaus Post: Patch Set 2: (1 comment) Please don’t reply on this GitHub thread. Visit golang.org/cl/774140. |
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
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.
When the coordinator's context deadline expires, there is a brief
window where ctx.Err() is set but fuzzCtx (a child context) has not
yet been canceled. If the coordinator's event loop observes <-doneC
during this window, the stop function compares the error against
fuzzCtx.Err() which is still nil, so the deadline error is not
suppressed and leaks out as a spurious test failure.
Fix this by also comparing against ctx.Err() in the suppression check.
ctx.Err() is guaranteed to be set before ctx.Done() is closed because
cancelCtx.cancel stores the error before closing the done channel.
Fixes #75804