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

Revert "kvserver: separate repl q decision from action" #91043

Merged
merged 1 commit into from
Nov 1, 2022

Conversation

nvanbenschoten
Copy link
Member

@nvanbenschoten nvanbenschoten commented Nov 1, 2022

This reverts commit d9448f4.

The commit was causing TestPartialZip to reliably fail. The cause of the failure has not been investigated, but this revert allows us to do so async without blocking master.

Epic: None

This reverts commit d9448f4.

The commit was causing `TestPartialZip` to reliably fail. The
cause of the failure has not been investigated, but this revert
allows us to do so async without blocking master.
@nvanbenschoten nvanbenschoten requested a review from a team as a code owner November 1, 2022 02:51
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Contributor

@AlexTalks AlexTalks left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @kvoli)

@nvanbenschoten
Copy link
Member Author

There's a circular dependency between this PR and #91031. We're going to have to hope that they end up in the same bors batch 🤞

TFTR!

bors r+

@nvanbenschoten
Copy link
Member Author

Screen Shot 2022-10-31 at 11 02 17 PM

@craig
Copy link
Contributor

craig bot commented Nov 1, 2022

Build failed (retrying...):

@nvanbenschoten
Copy link
Member Author

bors r-

Flake on TestExternalSortMemoryAccounting, which was meant to be resolved by #91008. See https://cockroachlabs.slack.com/archives/C016CAD2HQ8/p1667251438538819.

@craig
Copy link
Contributor

craig bot commented Nov 1, 2022

Canceled.

@nvanbenschoten
Copy link
Member Author

bors r+

@craig
Copy link
Contributor

craig bot commented Nov 1, 2022

Build succeeded:

@craig craig bot merged commit 18675b7 into cockroachdb:master Nov 1, 2022
@ajwerner
Copy link
Contributor

ajwerner commented Nov 1, 2022

Flake on TestExternalSortMemoryAccounting, which was meant to be resolved by #91008. See cockroachlabs.slack.com/archives/C016CAD2HQ8/p1667251438538819.

#91044 take two

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.

4 participants