Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kvserver: setup ranges in large unsplittable replicate test #112990

Merged
merged 2 commits into from
Oct 31, 2023

Conversation

kvoli
Copy link
Collaborator

@kvoli kvoli commented Oct 24, 2023

TestLargeUnsplittableRangeReplicate would fail when the SQL query to
show the table's replicas returned no results for the unsplittable range
being tested. No results would be returned when the table split was
delayed.

Update the test to insert a split at the first row, as well as the
existing split at the second row. This avoids the first range starting
with 5 replicas and the test's reliance on timely span config splits.

The previous deflake attempt is reverted.

Resolves: #112774
Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@kvoli kvoli changed the title Revert "kvserver: deflake large unsplittable range test" kvserver: setup ranges in large unsplittable replicate test Oct 24, 2023
@kvoli kvoli self-assigned this Oct 24, 2023
@kvoli kvoli added the backport-23.2.x Flags PRs that need to be backported to 23.2. label Oct 24, 2023
@kvoli
Copy link
Collaborator Author

kvoli commented Oct 24, 2023

Essential CI failure unrelated, I'll rebase later.

@kvoli kvoli force-pushed the 231024.deflake-large-unsplittable branch from e6bd351 to 6fab2c5 Compare October 24, 2023 20:49
@@ -1774,8 +1774,6 @@ func TestLargeUnsplittableRangeReplicate(t *testing.T) {
base.TestClusterArgs{
ReplicationMode: base.ReplicationAuto,
ServerArgs: base.TestServerArgs{
ScanMinIdleTime: time.Millisecond,
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was redundant, the test already force scan & processes every range within the SucceedsSoon loops below.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In addition to enqueuing on span config updates.

@kvoli kvoli marked this pull request as ready for review October 24, 2023 21:48
@kvoli kvoli requested a review from a team as a code owner October 24, 2023 21:48
`TestLargeUnsplittableRangeReplicate` would fail when the SQL query to
show the table's replicas returned no results for the unsplittable range
being tested. No results would be returned when the table split was
delayed.

Update the test to insert a split at the first row, as well as the
existing split at the second row. This avoids the first range starting
with 5 replicas and the test's reliance on timely span config splits.

Resolves: cockroachdb#112774
Release note: None
@kvoli kvoli force-pushed the 231024.deflake-large-unsplittable branch from 6fab2c5 to ad54149 Compare October 30, 2023 14:29
@kvoli kvoli requested review from andrewbaptist and removed request for andrewbaptist October 30, 2023 17:26
Copy link
Collaborator

@andrewbaptist andrewbaptist left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

@kvoli
Copy link
Collaborator Author

kvoli commented Oct 31, 2023

TYFTR

bors r=andrewbaptist

@craig
Copy link
Contributor

craig bot commented Oct 31, 2023

Build succeeded:

@craig craig bot merged commit 6bd0235 into cockroachdb:master Oct 31, 2023
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-23.2.x Flags PRs that need to be backported to 23.2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

kv/kvserver: TestLargeUnsplittableRangeReplicate failed
3 participants