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

storage: More CheckSSTConflicts fixes #98519

Merged
merged 1 commit into from
Mar 14, 2023

Conversation

itsbilal
Copy link
Member

@itsbilal itsbilal commented Mar 13, 2023

A few additional fixes around CheckSSTConflicts, stats calculations, and Next()ing logic, caught by kvnemesis. Hopefully the last of its kind.

Also re-enable kvnemesis testing for range keys in AddSSTable, reverting #98475.

Fixes #94141.
Fixes #98473.
Informs #94876.

Epic: none

Release note: None

@itsbilal itsbilal requested a review from erikgrinaker March 13, 2023 19:30
@itsbilal itsbilal requested review from a team as code owners March 13, 2023 19:30
@itsbilal itsbilal self-assigned this Mar 13, 2023
@itsbilal itsbilal requested a review from jbowens March 13, 2023 19:30
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Contributor

@erikgrinaker erikgrinaker left a comment

Choose a reason for hiding this comment

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

Thanks. Should we re-enable range keys in kvnemesis here too? See #98475.

A few additional fixes around CheckSSTConflicts, stats
calculations, and Next()ing logic, caught by kvnemesis.
Hopefully the last of its kind.

Also re-enable kvnemesis testing for range keys in
AddSSTable, reverting cockroachdb#98475.

Fixes cockroachdb#94141.
Fixes cockroachdb#98473.
Informs cockroachdb#94876.

Epic: none

Release note: None
@itsbilal itsbilal force-pushed the sstconflicts-fixes-3 branch from 34bffa5 to 9ec7760 Compare March 13, 2023 20:05
@itsbilal
Copy link
Member Author

@erikgrinaker TFTR! And yep, I've re-enabled it in the latest push.

@itsbilal
Copy link
Member Author

TFTR!

bors r=erikgrinaker

@craig
Copy link
Contributor

craig bot commented Mar 13, 2023

Build failed (retrying...):

@craig
Copy link
Contributor

craig bot commented Mar 13, 2023

Build failed (retrying...):

@craig
Copy link
Contributor

craig bot commented Mar 13, 2023

This PR was included in a batch that was canceled, it will be automatically retried

@craig
Copy link
Contributor

craig bot commented Mar 14, 2023

Build failed (retrying...):

@craig
Copy link
Contributor

craig bot commented Mar 14, 2023

Build failed:

@itsbilal
Copy link
Member Author

Timeout in UI tests.

bors r=erikgrinaker

@craig
Copy link
Contributor

craig bot commented Mar 14, 2023

Build failed (retrying...):

@craig
Copy link
Contributor

craig bot commented Mar 14, 2023

Build succeeded:

@craig craig bot merged commit ca5ae38 into cockroachdb:master Mar 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants