Merge #39046

39046: vendor: bump go.etcd.io/etcd r=nvanbenschoten a=tbg

This picks up Joint Consensus, see:

etcd-io/etcd#10914

Release note: None

Co-authored-by: Tobias Schottdorf <tobias.schottdorf@gmail.com>

pkg/storage/replica_raft.go

@@ -1265,7 +1265,7 @@ func (r *Replica) withRaftGroupLocked(
 			r.mu.state.RaftAppliedIndex,
 			r.store.cfg,
 			&raftLogger{ctx: ctx},
-		), nil)
+		))
 		if err != nil {
 			return err
 		}

pkg/storage/replica_raftstorage.go

@@ -67,7 +67,7 @@ func (r *replicaRaftStorage) InitialState() (raftpb.HardState, raftpb.ConfState,
 	}
 	var cs raftpb.ConfState
 	for _, rep := range r.mu.state.Desc.Replicas().Voters() {
-		cs.Nodes = append(cs.Nodes, uint64(rep.ReplicaID))
+		cs.Voters = append(cs.Voters, uint64(rep.ReplicaID))
 	}
 	for _, rep := range r.mu.state.Desc.Replicas().Learners() {
 		cs.Learners = append(cs.Learners, uint64(rep.ReplicaID))
@@ -540,7 +540,7 @@ func snapshot(
 	// Synthesize our raftpb.ConfState from desc.
 	var cs raftpb.ConfState
 	for _, rep := range desc.Replicas().Voters() {
-		cs.Nodes = append(cs.Nodes, uint64(rep.ReplicaID))
+		cs.Voters = append(cs.Voters, uint64(rep.ReplicaID))
 	}
 	for _, rep := range desc.Replicas().Learners() {
 		cs.Learners = append(cs.Learners, uint64(rep.ReplicaID))

pkg/storage/store_snapshot_preemptive.go

@@ -303,7 +303,7 @@ func (s *Store) processPreemptiveSnapshotRequest(
 				appliedIndex,
 				r.store.cfg,
 				&raftLogger{ctx: ctx},
-			), nil)
+			))
 		if err != nil {
 			return roachpb.NewError(err)
 		}