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.

Sign up for GitHub

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

Jump to bottom

kvserver: revert recent changes to reproposals #98481

Merged
merged 11 commits into from
Mar 14, 2023
Merged

kvserver: revert recent changes to reproposals #98481

merged 11 commits into from
Mar 14, 2023

Conversation

tbg
Copy link
Member

@tbg tbg commented Mar 13, 2023 •
edited
Loading

Reverts #97606, #97564, #94825, #94633.

  • Revert "kvserver: disable assertion 'finished proposal inserted'"
  • Revert "kvserver: narrow down 'finishing a proposal with outstanding reproposal'"
  • Revert "kvserver: fill gaps in comment near tryReproposeWithNewLeaseIndex"
  • Revert "kvserver: hoist early return out of tryReproposeWithNewLeaseIndex"
  • Revert "fixup! kvserver: prevent finished proposal from being present in proposals map"
  • Revert "kvserver: prevent finished proposal from being present in proposals map"
  • Revert "kvserver: improve reproposal assertions and documentation"

Closes #97973.

Epic: CRDB-25287
Release Note: none

tbg added 7 commits March 13, 2023 11:38
@tbg
Revert "kvserver: disable assertion 'finished proposal inserted'"
c5b42a7 
Reverts cockroachdb#97606.

This reverts commit f95866d.
@tbg
Revert "kvserver: narrow down 'finishing a proposal with outstanding …
70894d2 
…reproposal'"

Reverts cockroachdb#97564.

This reverts commit 554a5d5.
@tbg
Revert "kvserver: fill gaps in comment near tryReproposeWithNewLeaseI…
fcc8742 
…ndex"

Reverts cockroachdb#97564.

This reverts commit 6283099.
@tbg
Revert "kvserver: hoist early return out of tryReproposeWithNewLeaseI…
9a44384 
…ndex"

Reverts cockroachdb#97564.

This reverts commit 548b2f3.
@tbg
Revert "fixup! kvserver: prevent finished proposal from being present…
500bc82 
… in proposals map"

Reverts cockroachdb#94825.

This reverts commit ac23f46.
@tbg
Revert "kvserver: prevent finished proposal from being present in pro…
e23a2ea 
…posals map"

Reverts cockroachdb#94825.

This reverts commit 15b1c6a.
@tbg
Revert "kvserver: improve reproposal assertions and documentation"
939f955 
Reverts cockroachdb#97973.

This reverts commit 866d58a.
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@tbg tbg marked this pull request as ready for review March 13, 2023 20:50
@tbg tbg requested a review from a team March 13, 2023 20:50
@tbg tbg requested a review from a team as a code owner March 13, 2023 20:50
@tbg tbg requested a review from pav-kv March 13, 2023 20:50
@tbg
Copy link
Member Author

tbg commented Mar 14, 2023

bors r=pavelkalinnikov
TFTR!

@craig
Copy link
Contributor

craig bot commented Mar 14, 2023

Build succeeded:

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

@pav-kv pav-kv pav-kv approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

kvserver: revert recent reproposal changes
3 participants
@tbg @cockroach-teamcity @pav-kv