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

Merge pull request #2814 from kmlebedev/fix_remove_deleted_peers

Browse source 
Fix remove deleted peers
This commit is contained in:
Chris Lu 2022-03-25 11:36:15 -07:00 committed by GitHub
parent aa24af77aa ddd3945c26
commit 1b27f96669
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
weed/server/raft_server.go
View file

@ -81,10 +81,11 @@ func NewRaftServer(option *RaftServerOption) (*RaftServer, error) {
transporter := raft.NewGrpcTransporter(option.GrpcDialOption) transporter := raft.NewGrpcTransporter(option.GrpcDialOption)
glog.V(0).Infof("Starting RaftServer with %v", option.ServerAddr) glog.V(0).Infof("Starting RaftServer with %v", option.ServerAddr)
// always clear previous log to avoid server is promotable
os.RemoveAll(path.Join(s.dataDir, "log"))
if !option.RaftResumeState { if !option.RaftResumeState {
// always clear previous metadata // always clear previous metadata
os.RemoveAll(path.Join(s.dataDir, "conf")) os.RemoveAll(path.Join(s.dataDir, "conf"))
os.RemoveAll(path.Join(s.dataDir, "log"))
os.RemoveAll(path.Join(s.dataDir, "snapshot")) os.RemoveAll(path.Join(s.dataDir, "snapshot"))
} }
if err := os.MkdirAll(path.Join(s.dataDir, "snapshot"), 0600); err != nil { if err := os.MkdirAll(path.Join(s.dataDir, "snapshot"), 0600); err != nil {
@ -118,17 +119,17 @@ func NewRaftServer(option *RaftServerOption) (*RaftServer, error) {
exists := false exists := false
var existingPeer pb.ServerAddress var existingPeer pb.ServerAddress
for _, peer := range s.peers { for _, peer := range s.peers {
if peer.ToGrpcAddress() == existsPeerName { if peer.String() == existsPeerName {
exists, existingPeer = true, peer exists, existingPeer = true, peer
break break
} }
} }
if exists { if !exists {
if err := s.raftServer.RemovePeer(existsPeerName); err != nil { if err := s.raftServer.RemovePeer(existsPeerName); err != nil {
glog.V(0).Infoln(err) glog.V(0).Infoln(err)
return nil, err return nil, err
} else { } else {
glog.V(0).Infof("removing old peer %s", existingPeer) glog.V(0).Infof("removing old peer: %s", existingPeer)
} }
} }
} }