gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

refactor

Browse source
This commit is contained in:
chrislu 2022-03-26 10:21:26 -07:00
parent 1b27f96669
commit a3411dd9da
1 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
weed/server/raft_server.go
View file

@ -5,8 +5,6 @@ import (
"math/rand" "math/rand"
"os" "os"
"path" "path"
"sort"
"strings"
"time" "time"
"google.golang.org/grpc" "google.golang.org/grpc"
@ -31,7 +29,7 @@ type RaftServerOption struct {
} }
type RaftServer struct { type RaftServer struct {
peers []pb.ServerAddress // initial peers to join with peers map[string]pb.ServerAddress // initial peers to join with
raftServer raft.Server raftServer raft.Server
dataDir string dataDir string
serverAddr pb.ServerAddress serverAddr pb.ServerAddress
@ -64,8 +62,12 @@ func (s StateMachine) Recovery(data []byte) error {
} }
func NewRaftServer(option *RaftServerOption) (*RaftServer, error) { func NewRaftServer(option *RaftServerOption) (*RaftServer, error) {
peers := make(map[string]pb.ServerAddress)
for _, peer := range option.Peers {
peers[peer.String()] = peer
}
s := &RaftServer{ s := &RaftServer{
peers: option.Peers, peers: peers,
serverAddr: option.ServerAddr, serverAddr: option.ServerAddr,
dataDir: option.DataDir, dataDir: option.DataDir,
topo: option.Topo, topo: option.Topo,
@ -108,8 +110,8 @@ func NewRaftServer(option *RaftServerOption) (*RaftServer, error) {
return nil, err return nil, err
} }
for _, peer := range s.peers { for name, peer := range s.peers {
if err := s.raftServer.AddPeer(string(peer), peer.ToGrpcAddress()); err != nil { if err := s.raftServer.AddPeer(name, peer.ToGrpcAddress()); err != nil {
return nil, err return nil, err
} }
} }
@ -118,8 +120,8 @@ func NewRaftServer(option *RaftServerOption) (*RaftServer, error) {
for existsPeerName := range s.raftServer.Peers() { for existsPeerName := range s.raftServer.Peers() {
exists := false exists := false
var existingPeer pb.ServerAddress var existingPeer pb.ServerAddress
for _, peer := range s.peers { for name, peer := range s.peers {
if peer.String() == existsPeerName { if name == existsPeerName {
exists, existingPeer = true, peer exists, existingPeer = true, peer
break break
} }
@ -136,11 +138,6 @@ func NewRaftServer(option *RaftServerOption) (*RaftServer, error) {
s.GrpcServer = raft.NewGrpcServer(s.raftServer) s.GrpcServer = raft.NewGrpcServer(s.raftServer)
if s.raftServer.IsLogEmpty() && isTheFirstOne(option.ServerAddr, s.peers) {
// Initialize the server by joining itself.
// s.DoJoinCommand()
}
glog.V(0).Infof("current cluster leader: %v", s.raftServer.Leader()) glog.V(0).Infof("current cluster leader: %v", s.raftServer.Leader())
return s, nil return s, nil
@ -156,16 +153,6 @@ func (s *RaftServer) Peers() (members []string) {
return return
} }
func isTheFirstOne(self pb.ServerAddress, peers []pb.ServerAddress) bool {
sort.Slice(peers, func(i, j int) bool {
return strings.Compare(string(peers[i]), string(peers[j])) < 0
})
if len(peers) <= 0 {
return true
}
return self == peers[0]
}
func (s *RaftServer) DoJoinCommand() { func (s *RaftServer) DoJoinCommand() {
glog.V(0).Infoln("Initializing new cluster") glog.V(0).Infoln("Initializing new cluster")