Merge cockroachdb#106061

106061: kvserver: remove unnecessary condition r=erikgrinaker a=tbg The `!reproposal` condition already captures whether this is the first time the proposal is seen in that method. The other condition added only fear, uncertainty, and doubt. Epic: CRDB-25287 Release note: None Co-authored-by: Tobias Grieger <[email protected]>
xinhaoz · Jul 10, 2023 · e2327d0 · e2327d0
2 parents 0207c61 + 6cf66d3
commit e2327d0
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/pkg/kv/kvserver/replica_proposal_buf.go b/pkg/kv/kvserver/replica_proposal_buf.go
@@ -603,13 +603,7 @@ func (b *propBuf) FlushLockedWithRaftGroup(
 
 			// We don't want deduct flow tokens for reproposed commands, and of
 			// course for proposals that didn't integrate with kvflowcontrol.
-			//
-			// TODO(tbg): with useReproposalsV2, we make new proposals in
-			// tryReproposeWithNewLeaseIndex that will have createdAtTicks ==
-			// proposedAtTicks. They will have !reproposal but raftAdmissionMeta=nil.
-			// What is createdAtTicks==proposedAtTicks even good for? The !reproposal
-			// condition already handles the case in which it isn't.
-			shouldAdmit := p.createdAtTicks == p.proposedAtTicks && !reproposal && p.raftAdmissionMeta != nil
+			shouldAdmit := !reproposal && p.raftAdmissionMeta != nil
 			if !shouldAdmit {
 				admitHandles = append(admitHandles, admitEntHandle{})
 			} else {