Skip to content

Commit

Permalink
Revert "kvserver: disable assertion 'finished proposal inserted'"
Browse files Browse the repository at this point in the history
Reverts cockroachdb#97606.

This reverts commit f95866d.
  • Loading branch information
tbg committed Mar 13, 2023
1 parent e4924e2 commit c5b42a7
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions pkg/kv/kvserver/replica_proposal_buf.go
Original file line number Diff line number Diff line change
Expand Up @@ -1189,10 +1189,7 @@ func (rp *replicaProposer) registerProposalLocked(p *ProposalData) {
if p.createdAtTicks == 0 {
p.createdAtTicks = rp.mu.ticks
}
// TODO(tbg): this assertion fires. Figure out why. See:
// https://github.com/cockroachdb/cockroach/issues/97605
const enableAssertion = false
if enableAssertion && buildutil.CrdbTestBuild && (p.ec.repl == nil || p.ec.g == nil) {
if buildutil.CrdbTestBuild && (p.ec.repl == nil || p.ec.g == nil) {
log.Fatalf(rp.store.AnnotateCtx(context.Background()), "finished proposal inserted into map: %+v", p)
}
if prev := rp.mu.proposals[p.idKey]; prev != nil && prev != p {
Expand Down

0 comments on commit c5b42a7

Please sign in to comment.