luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

backport of commit 776a26bce7cf3a320fc7e7f4a6bf9da2b30f3da7 (#18375) 

Co-authored-by: James Rasell <jrasell@users.noreply.github.com>
This commit is contained in:
hc-github-team-nomad-core 2023-09-01 04:25:08 -05:00 committed by GitHub
parent ef780825d4
commit 1b2237d6a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/18352.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
raft: remove use of deprecated Leader func
```

2
helper/snapshot/snapshot_test.go
View File

@ -110,7 +110,7 @@ func makeRaft(t *testing.T, dir string) (*raft.Raft, *MockFSM) {
timeout := time.After(10 * time.Second) timeout := time.After(10 * time.Second)
for { for {
if raft.Leader() != "" { if leaderAddr, _ := raft.LeaderWithID(); leaderAddr != "" {
break break
} }

3
nomad/node_endpoint.go
View File

@ -317,7 +317,8 @@ func equalDevices(n1, n2 *structs.Node) bool {
// constructNodeServerInfoResponse assumes the n.srv.peerLock is held for reading. // constructNodeServerInfoResponse assumes the n.srv.peerLock is held for reading.
func (n *Node) constructNodeServerInfoResponse(nodeID string, snap *state.StateSnapshot, reply *structs.NodeUpdateResponse) error { func (n *Node) constructNodeServerInfoResponse(nodeID string, snap *state.StateSnapshot, reply *structs.NodeUpdateResponse) error {
reply.LeaderRPCAddr = string(n.srv.raft.Leader()) leaderAddr, _ := n.srv.raft.LeaderWithID()
reply.LeaderRPCAddr = string(leaderAddr)
// Reply with config information required for future RPC requests // Reply with config information required for future RPC requests
reply.Servers = make([]*structs.NodeServerInfo, 0, len(n.srv.localPeers)) reply.Servers = make([]*structs.NodeServerInfo, 0, len(n.srv.localPeers))

2
nomad/operator_endpoint.go
View File

@ -75,7 +75,7 @@ func (op *Operator) RaftGetConfiguration(args *structs.GenericRequest, reply *st
} }
// Fill out the reply. // Fill out the reply.
leader := op.srv.raft.Leader() leader, _ := op.srv.raft.LeaderWithID()
reply.Index = future.Index() reply.Index = future.Index()
for _, server := range future.Configuration().Servers { for _, server := range future.Configuration().Servers {
node := "(unknown)" node := "(unknown)"

5
nomad/rpc.go
View File

@ -625,7 +625,7 @@ func (s *Server) getLeader() (bool, *serverParts) {
} }
// Get the leader // Get the leader
leader := s.raft.Leader() leader, _ := s.raft.LeaderWithID()
if leader == "" { if leader == "" {
return false, nil return false, nil
} }
@ -793,7 +793,8 @@ func (r *rpcHandler) setQueryMeta(m *structs.QueryMeta) {
m.KnownLeader = true m.KnownLeader = true
} else { } else {
m.LastContact = time.Since(r.raft.LastContact()) m.LastContact = time.Since(r.raft.LastContact())
m.KnownLeader = (r.raft.Leader() != "") leaderAddr, _ := r.raft.LeaderWithID()
m.KnownLeader = (leaderAddr != "")
} }
} }

5
nomad/server.go
View File

@ -923,7 +923,7 @@ func (s *Server) setupBootstrapHandler() error {
// correct number of servers required for quorum are present). // correct number of servers required for quorum are present).
bootstrapFn := func() error { bootstrapFn := func() error {
// If there is a raft leader, do nothing // If there is a raft leader, do nothing
if s.raft.Leader() != "" { if leader, _ := s.raft.LeaderWithID(); leader != "" {
peersTimeout.Reset(maxStaleLeadership) peersTimeout.Reset(maxStaleLeadership)
return nil return nil
} }
@ -1948,11 +1948,12 @@ func (s *Server) Stats() map[string]map[string]string {
toString := func(v uint64) string { toString := func(v uint64) string {
return strconv.FormatUint(v, 10) return strconv.FormatUint(v, 10)
} }
leader, _ := s.raft.LeaderWithID()
stats := map[string]map[string]string{ stats := map[string]map[string]string{
"nomad": { "nomad": {
"server": "true", "server": "true",
"leader": fmt.Sprintf("%v", s.IsLeader()), "leader": fmt.Sprintf("%v", s.IsLeader()),
"leader_addr": string(s.raft.Leader()), "leader_addr": string(leader),
"bootstrap": fmt.Sprintf("%v", s.isSingleServerCluster()), "bootstrap": fmt.Sprintf("%v", s.isSingleServerCluster()),
"known_regions": toString(uint64(len(s.peers))), "known_regions": toString(uint64(len(s.peers))),
}, },

4
nomad/status_endpoint.go
View File

@ -47,9 +47,9 @@ func (s *Status) Leader(args *structs.GenericRequest, reply *string) error {
return err return err
} }
leader := string(s.srv.raft.Leader()) leader, _ := s.srv.raft.LeaderWithID()
if leader != "" { if leader != "" {
*reply = leader *reply = string(leader)
} else { } else {
*reply = "" *reply = ""
} }