intentresolver: fix test flake for CleanupIntents #35273
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
|
This change is |
nvanbenschoten
approved these changes
Mar 6, 2019
There was a problem hiding this comment.
testing.T objects in the send func closures. If we run into issues with t.Fataling on a different goroutine, we can switch the assertions over to using the assert package.
Reviewed 1 of 1 files at r1.
Reviewable status:complete! 1 of 0 LGTMs obtained (waiting on @ajwerner)
pkg/storage/intentresolver/intent_resolver_test.go, line 821 at r1 (raw file):
f = func(ba roachpb.BatchRequest) (*roachpb.BatchResponse, *roachpb.Error) { if remaining := atomic.LoadInt64(&toPush); len(ba.Requests) > int(remaining) { panic(fmt.Errorf("expected at most %d PushTxnRequests in batch, got %d",
Panicking causes some pretty bad test output (#35166, #35340). Can we plumb a *testing.T in here (and elsewhere) and t.Fatal?
The test before was brittle and assumed that batching was always triggered on size rather than on timing. This mean that the test would fail if something slowed test execution even though there was no correctness violation. This PR makes the test less brittle by allowing intents to be resolved in an arbitrary number of batches. This change has the nice side effect of allowing the wait time for the requestbatcher to be shortened. Fixes cockroachdb#35166. Release note: None
ajwerner
force-pushed
the
ajwerner/make-test-less-flakey
branch
from
bb3566c to
e736216
Compare
ajwerner
commented
Mar 6, 2019
There was a problem hiding this comment.
Reviewable status:
pkg/storage/intentresolver/intent_resolver_test.go, line 821 at r1 (raw file):
Previously, nvanbenschoten (Nathan VanBenschoten) wrote…
Panicking causes some pretty bad test output (#35166, #35340). Can we plumb a
*testing.Tin here (and elsewhere) andt.Fatal?
I'll admit the panics were lazy. I plumbed a testing.T through to the sendFuncs.
|
bors r+ |
craig bot
pushed a commit
that referenced
this pull request
Mar 6, 2019
35273: intentresolver: fix test flake for CleanupIntents r=ajwerner a=ajwerner The test before was brittle and assumed that batching was always triggered on size rather than on timing. This mean that the test would fail if something slowed test execution even though there was no correctness violation. This PR makes the test less brittle by allowing intents to be resolved in an arbitrary number of batches. This change has the nice side effect of allowing the wait time for the requestbatcher to be shortened. Fixes #35166. Release note: None Co-authored-by: Andrew Werner <[email protected]>
Build succeeded |
ajwerner
added a commit
to ajwerner/cockroach
that referenced
this pull request
Mar 12, 2019
Before this change we'd assume that two requests addressed to the same range would end up in the same batch. This patch adopts the more flexible logic introduced in cockroachdb#35273 to resolve similar test flakes in TestCleanupIntents. This new infrastructure behaves correctly when batches are sent due to time with less batching than the test assumed. Fixes cockroachdb#35340. Release note: None
craig bot
pushed a commit
that referenced
this pull request
Mar 13, 2019
35667: intentresolver: fix test flake due to timing of batches r=ajwerner a=ajwerner Before this change we'd assume that two requests addressed to the same range would end up in the same batch. This patch adopts the more flexible logic introduced in #35273 to resolve similar test flakes in TestCleanupIntents. This new infrastructure behaves correctly when batches are sent due to time with less batching than the test assumed. Fixes #35340. Release note: None Co-authored-by: Andrew Werner <[email protected]>
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.
The test before was brittle and assumed that batching was always triggered on
size rather than on timing. This mean that the test would fail if something
slowed test execution even though there was no correctness violation. This PR
makes the test less brittle by allowing intents to be resolved in an arbitrary
number of batches. This change has the nice side effect of allowing the wait
time for the requestbatcher to be shortened.
Fixes #35166.
Release note: None