Skip to content

kvserver: revert recent changes to reproposals#98481

Merged
craig[bot] merged 11 commits intocockroachdb:masterfrom
tbg:revert-reproposals
Mar 14, 2023
Merged

kvserver: revert recent changes to reproposals#98481
craig[bot] merged 11 commits intocockroachdb:masterfrom
tbg:revert-reproposals

Conversation

@tbg
Copy link
Copy Markdown
Member

@tbg tbg commented Mar 13, 2023

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

@cockroach-teamcity
Copy link
Copy Markdown
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
Copy Markdown
Member Author

tbg commented Mar 14, 2023

bors r=pavelkalinnikov
TFTR!

@craig
Copy link
Copy Markdown
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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

kvserver: revert recent reproposal changes

3 participants