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

batcheval: deflake version-upgrade (again) #53011

Merged

Conversation

irfansharif
Copy link
Contributor

Fixes #52907. Unskips it as well.

The patch in #52750 was not quite complete. We had zeroed out the
replicated RHS delta appropriately, but forgot to consider the RHS stats
added to the batch then later used to seed RHS state. I re-verified this
patch using the same splits/mixed-version test but running for more
iterations.

Release note: None

Fixes cockroachdb#52907. Unskips it as well.

The patch in cockroachdb#52750 was not quite complete. We had zeroed out the
replicated RHS delta appropriately, but forgot to consider the RHS stats
added to the batch then later used to seed RHS state. I re-verified this
patch using the same `splits/mixed-version` test but running for more
iterations.

Release note: None
@irfansharif irfansharif requested a review from tbg August 19, 2020 05:15
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@tbg
Copy link
Member

tbg commented Aug 19, 2020

Could this also take care of #53017?

@irfansharif
Copy link
Contributor Author

Could this also take care of #53017?

It would.

@irfansharif
Copy link
Contributor Author

bors r+

@craig
Copy link
Contributor

craig bot commented Aug 19, 2020

Build succeeded:

@craig craig bot merged commit 944dbc3 into cockroachdb:master Aug 19, 2020
@irfansharif irfansharif deleted the 200819.deflake-version-upgrade-again branch August 19, 2020 14:25
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.

roachtest: acceptance/version-upgrade failed
3 participants