Merge #79522

79522: kv: remove raft leader progress override in newTruncateDecision r=nvanbenschoten a=nvanbenschoten Addresses a long-standing TODO. We picked up etcd-io/etcd#10279 a while ago. Co-authored-by: Nathan VanBenschoten <[email protected]>
cockroachdb · Apr 7, 2022 · 38a3442 · 38a3442
2 parents e54a36c + cacac45
commit 38a3442
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/pkg/kv/kvserver/raft_log_queue.go b/pkg/kv/kvserver/raft_log_queue.go
@@ -309,13 +309,6 @@ func newTruncateDecision(ctx context.Context, r *Replica) (truncateDecision, err
 	log.Eventf(ctx, "raft status after lastUpdateTimes check: %+v", raftStatus.Progress)
 	r.mu.RUnlock()
 
-	if pr, ok := raftStatus.Progress[raftStatus.Lead]; ok {
-		// TODO(tschottdorf): remove this line once we have picked up
-		// https://github.com/etcd-io/etcd/pull/10279
-		pr.State = tracker.StateReplicate
-		raftStatus.Progress[raftStatus.Lead] = pr
-	}
-
 	input := truncateDecisionInput{
 		RaftStatus:           *raftStatus,
 		LogSize:              raftLogSize,