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

fix: remove deleted peers if resumeState = true

Browse source
This commit is contained in:
Устюжанин Антон Александрович 2020-10-04 21:56:17 +05:00
parent b3dd0ba446
commit 702b1cb876
2 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
weed/server/raft_server.go
View file

@ -104,7 +104,24 @@ func NewRaftServer(grpcDialOption grpc.DialOption, peers []string, serverAddr, d
if err := s.raftServer.AddPeer(peer, pb.ServerToGrpcAddress(peer)); err != nil {
return nil, err
}
}
// Remove deleted peers
if raftResumeState {
for existsPeerName, _ := range s.raftServer.Peers() {
exists := false
for _, peer := range s.peers {
if peer == existsPeerName {
exists = true
}
}
if !exists {
if err := s.raftServer.RemovePeer(existsPeerName); err != nil {
glog.V(0).Infoln(err)
return nil, err
}
}
}
}
s.GrpcServer = raft.NewGrpcServer(s.raftServer)

14
weed/server/raft_server_handlers.go
View file

@ -1,20 +1,24 @@
package weed_server
import (
"github.com/chrislusf/seaweedfs/weed/storage/needle"
"net/http"
)
type ClusterStatusResult struct {
IsLeader bool `json:"IsLeader,omitempty"`
Leader string `json:"Leader,omitempty"`
Peers []string `json:"Peers,omitempty"`
IsLeader bool `json:"IsLeader,omitempty"`
Leader string `json:"Leader,omitempty"`
Peers []string `json:"Peers,omitempty"`
MaxVolumeId needle.VolumeId `json:"MaxVolumeId,omitempty"`
}
func (s *RaftServer) StatusHandler(w http.ResponseWriter, r *http.Request) {
ret := ClusterStatusResult{
IsLeader: s.topo.IsLeader(),
Peers: s.Peers(),
IsLeader: s.topo.IsLeader(),
Peers: s.Peers(),
MaxVolumeId: s.topo.GetMaxVolumeId(),
}
if leader, e := s.topo.Leader(); e == nil {
ret.Leader = leader
}