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

check for ping before deleting raft server

Browse source 
https://github.com/chrislusf/seaweedfs/issues/3083
This commit is contained in:
Konstantin Lebedev 2022-07-20 00:04:12 +05:00
parent 2ae3f812f8
commit 6cfbfb0849
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
weed/server/master_server.go
View file

@ -372,8 +372,26 @@ func (ms *MasterServer) OnPeerUpdate(update *master_pb.ClusterNodeUpdate, startF
} else if isLeader {
go func(peerName string) {
raftServerRemovalTimeAfter := time.After(RaftServerRemovalTime)
raftServerPingTicker := time.NewTicker(5 * time.Minute)
defer func() {
ms.onPeerUpdateDoneCnExist = false
}()
for {
select {
case <-raftServerPingTicker.C:
err := ms.MasterClient.WithClient(false, func(client master_pb.SeaweedClient) error {
_, err := client.Ping(context.Background(), &master_pb.PingRequest{
Target: peerName,
TargetType: cluster.MasterType,
})
return err
})
if err != nil {
glog.Warningf("raft server %s ping failed %+v", peerName, err)
} else {
glog.V(0).Infof("raft server %s remove canceled on ping success", peerName)
return
}
case <-raftServerRemovalTimeAfter:
err := ms.MasterClient.WithClient(false, func(client master_pb.SeaweedClient) error {
_, err := client.RaftRemoveServer(context.Background(), &master_pb.RaftRemoveServerRequest{
@ -384,12 +402,13 @@ func (ms *MasterServer) OnPeerUpdate(update *master_pb.ClusterNodeUpdate, startF
})
if err != nil {
glog.Warningf("failed to removing old raft server %s: %v", peerName, err)
return
}
glog.V(0).Infof("old raft server %s removed", peerName)
return
case peerDone := <-ms.onPeerUpdateDoneCn:
if peerName == peerDone {
glog.V(0).Infof("raft server %s remove canceled", peerName)
glog.V(0).Infof("raft server %s remove canceled on onPeerUpdate", peerName)
return
}
}