gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Normalize hashicorp raft peer ids (#8253)

Browse Source 
* Normalize raft voter ids

* 4.11

* Update raft_hashicorp.go
This commit is contained in:
Chris Lu
2026-02-09 07:46:34 -08:00
committed by GitHub
parent 2ed5a8f65c
commit cb9e21cdc5
5 changed files with 119 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
weed/server/raft_hashicorp.go
View File

@@ -11,7 +11,6 @@ import (
"path"
"path/filepath"
"sort"
"strings"
"time"
transport "github.com/Jille/raft-grpc-transport"
@@ -34,26 +33,34 @@ const (
)
func getPeerIdx(self pb.ServerAddress, mapPeers map[string]pb.ServerAddress) int {
peers := make([]pb.ServerAddress, 0, len(mapPeers))
peerIDs := make([]string, 0, len(mapPeers))
seen := make(map[string]struct{}, len(mapPeers))
for _, peer := range mapPeers {
peers = append(peers, peer)
}
sort.Slice(peers, func(i, j int) bool {
return strings.Compare(string(peers[i]), string(peers[j])) < 0
})
for i, peer := range peers {
if string(peer) == string(self) {
return i
id := raftServerID(peer)
if _, ok := seen[id]; ok {
continue
}
seen[id] = struct{}{}
peerIDs = append(peerIDs, id)
}
sort.Strings(peerIDs)
selfID := raftServerID(self)
idx := sort.SearchStrings(peerIDs, selfID)
if idx < len(peerIDs) && peerIDs[idx] == selfID {
return idx
}
return -1
}
func raftServerID(server pb.ServerAddress) string {
return server.ToHttpAddress()
}
func (s *RaftServer) AddPeersConfiguration() (cfg raft.Configuration) {
for _, peer := range s.peers {
cfg.Servers = append(cfg.Servers, raft.Server{
Suffrage: raft.Voter,
ID: raft.ServerID(peer),
ID: raft.ServerID(raftServerID(peer)),
Address: raft.ServerAddress(peer.ToGrpcAddress()),
})
}
@@ -98,7 +105,12 @@ func (s *RaftServer) monitorLeaderLoop(updatePeers bool) {
}
func (s *RaftServer) updatePeers() {
peerLeader := string(s.serverAddr)
peerLeader := raftServerID(s.serverAddr)
desiredPeers := make(map[string]pb.ServerAddress, len(s.peers))
for _, peer := range s.peers {
desiredPeers[raftServerID(peer)] = peer
}
existsPeerName := make(map[string]bool)
for _, server := range s.RaftHashicorp.GetConfiguration().Configuration().Servers {
if string(server.ID) == peerLeader {
@@ -106,8 +118,7 @@ func (s *RaftServer) updatePeers() {
}
existsPeerName[string(server.ID)] = true
}
for _, peer := range s.peers {
peerName := string(peer)
for peerName, peer := range desiredPeers {
if peerName == peerLeader || existsPeerName[peerName] {
continue
}
@@ -116,12 +127,12 @@ func (s *RaftServer) updatePeers() {
raft.ServerID(peerName), raft.ServerAddress(peer.ToGrpcAddress()), 0, 0)
}
for peer := range existsPeerName {
if _, found := s.peers[peer]; !found {
if _, found := desiredPeers[peer]; !found {
glog.V(0).Infof("removing old peer: %s", peer)
s.RaftHashicorp.RemoveServer(raft.ServerID(peer), 0, 0)
}
}
if _, found := s.peers[peerLeader]; !found {
if _, found := desiredPeers[peerLeader]; !found {
glog.V(0).Infof("removing old leader peer: %s", peerLeader)
s.RaftHashicorp.RemoveServer(raft.ServerID(peerLeader), 0, 0)
}
@@ -136,7 +147,7 @@ func NewHashicorpRaftServer(option *RaftServerOption) (*RaftServer, error) {
}
c := raft.DefaultConfig()
c.LocalID = raft.ServerID(s.serverAddr) // TODO maybee the IP:port address will change
c.LocalID = raft.ServerID(raftServerID(s.serverAddr))
c.HeartbeatTimeout = time.Duration(float64(option.HeartbeatInterval) * (rand.Float64()*0.25 + 1))
c.ElectionTimeout = option.ElectionTimeout
if c.LeaderLeaseTimeout > c.HeartbeatTimeout {