tabletserver: fix flaky test #7851
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
vmg
requested review from
harshit-gangal,
shlomi-noach and
systay
as code owners
There was a problem hiding this comment.
I tried this locally and it is not failing for the first part of the test.
It is failing below now.
--- FAIL: TestConsolidatorMemoryLimits (0.54s)
--- FAIL: TestConsolidatorMemoryLimits/multiple_phase_consolidation (0.17s)
stream_consolidator_test.go:398:
Error Trace: stream_consolidator_test.go:398
Error: Not equal:
expected: 4
actual : 3
Test: TestConsolidatorMemoryLimits/multiple_phase_consolidation
harshit-gangal
approved these changes
Apr 13, 2021
| @@ -97,6 +99,15 @@ func (ct *consolidationTest) leader(stream StreamCallback) error { | |||
| return nil | |||
| } | |||
|
|
|||
| func (ct *consolidationTest) waitForResults(worker int, count int64) { | |||
| for { | |||
| if atomic.LoadInt64(&ct.results[worker].count) > count { | |||
There was a problem hiding this comment.
Just making sure you intended for > and not >=?
There was a problem hiding this comment.
Ayup, it needs to wait until we have received more than the expected amount of results.
shlomi-noach
approved these changes
Apr 13, 2021
|
@vmg rebase from master will fix CI failure. |
Signed-off-by: Vicent Marti <vmg@strn.cat>
Signed-off-by: Vicent Marti <vmg@strn.cat>
vmg
force-pushed
the
vmg/consolidation-flaky
branch
from
1bdd2b4
to
37a2a5c
Compare
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.
Description
This is a flaky test that @harshit-gangal detected. I'm quite sure this is the proper fix.
Related Issue(s)
Fixes #7832
Fixes #7837
Checklist
Deployment Notes
Impacted Areas in Vitess
Components that this PR will affect: