remove Candidate field from pre-vote request

hashicorp · Apr 2, 2024 · 1912201 · 1912201
1 parent 4f6fc13
commit 1912201
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/commands.go b/commands.go
@@ -128,9 +128,6 @@ type RequestPreVoteRequest struct {
 	// Provide the term and our id
 	Term uint64
 
-	// Deprecated: use RPCHeader.Addr instead
-	Candidate []byte
-
 	// Used to ensure safety
 	LastLogIndex uint64
 	LastLogTerm  uint64

diff --git a/raft.go b/raft.go
@@ -2059,10 +2059,8 @@ func (r *Raft) preElectSelf() <-chan *preVoteResult {
 	// Construct the request
 	lastIdx, lastTerm := r.getLastEntry()
 	req := &RequestPreVoteRequest{
-		RPCHeader: r.getRPCHeader(),
-		Term:      newTerm,
-		// this is needed for retro compatibility, before RPCHeader.Addr was added
-		Candidate:    r.trans.EncodePeer(r.localID, r.localAddr),
+		RPCHeader:    r.getRPCHeader(),
+		Term:         newTerm,
 		LastLogIndex: lastIdx,
 		LastLogTerm:  lastTerm,
 	}