mirror/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-12-18 20:57:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1507 from ustuzhanin/raft_remove_peers

Browse Source 
Raft remove peers
This commit is contained in:
Chris Lu 2020-10-04 11:41:10 -07:00 committed by GitHub
commit b597406699
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 { if err := s.raftServer.AddPeer(peer, pb.ServerToGrpcAddress(peer)); err != nil {
return nil, err 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) s.GrpcServer = raft.NewGrpcServer(s.raftServer)

14
weed/server/raft_server_handlers.go
View File

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