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: deflake test store capacity after split #98515

Merged
merged 1 commit into from
Mar 14, 2023

Conversation

kvoli
Copy link
Collaborator

@kvoli kvoli commented Mar 13, 2023

This commit defales TestStoreCapacityAfterSplit. Previously it was possible for the replica load stats which underpins Capacity to be reset. The reset caused the recording duration to fall short of min stats duration, which led to a 0 value being reported for writes in store capacity.

This commit bumps the manual clock twice and removes redundant leaseholder checks within a retry loop. The combination of these two changes makes the test much less likely to flake.

The test is now unskipped.

dev test pkg/kv/kvserver -f TestStoreCapacityAfterSplit -v --stress
...
4410 runs so far, 0 failures, over 6m10s

Resolves: #92677

Release note: None

@kvoli kvoli self-assigned this Mar 13, 2023
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@kvoli kvoli marked this pull request as ready for review March 13, 2023 19:32
@kvoli kvoli requested a review from a team as a code owner March 13, 2023 19:32
@kvoli kvoli requested a review from andrewbaptist March 13, 2023 19:32
This commit deflakes `TestStoreCapacityAfterSplit`. Previously it was
possible for the replica load stats which underpins Capacity to be
reset. The reset caused the recording duration to fall short of min
stats duration, which led to a 0 value being reported for writes in
store capacity.

This commit bumps the manual clock twice and removes redundant
leaseholder checks within a retry loop. The combination of these two
changes makes the test much less likely to flake.

The test is now unskipped.

```
dev test pkg/kv/kvserver -f TestStoreCapacityAfterSplit -v --stress
...
4410 runs so far, 0 failures, over 6m10s
```

Resolves: cockroachdb#92677

Release note: None
@kvoli kvoli force-pushed the 230309.store-capacity-split branch from fbe699a to 0d35a08 Compare March 13, 2023 21:51
Copy link
Contributor

@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 Mar 14, 2023

bors r=andrewbaptist

@craig craig bot merged commit a36d88b into cockroachdb:master Mar 14, 2023
@craig
Copy link
Contributor

craig bot commented Mar 14, 2023

Build succeeded:

@kvoli
Copy link
Collaborator Author

kvoli commented Oct 13, 2023

blathers backport 22.2

@blathers-crl
Copy link

blathers-crl bot commented Oct 13, 2023

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from 0d35a08 to blathers/backport-release-22.2-98515: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 22.2 failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

kvserver: flake with TestStoreCapacityAfterSplit
3 participants