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 #3336 from kmlebedev/raftSrvRemove

Browse source 
raftServerRemoval typo and logs
This commit is contained in:
Chris Lu 2022-07-19 11:32:17 -07:00 committed by GitHub
parent f909265721 f419d5643a
commit f0d560060f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
weed/server/master_server.go
View file

@ -65,8 +65,8 @@ type MasterServer struct {
boundedLeaderChan chan int boundedLeaderChan chan int
onPeerUpdatDoneCn chan string onPeerUpdateDoneCn chan string
onPeerUpdatDoneCnExist bool onPeerUpdateDoneCnExist bool
// notifying clients // notifying clients
clientChansLock sync.RWMutex clientChansLock sync.RWMutex
@ -118,7 +118,7 @@ func NewMasterServer(r *mux.Router, option *MasterOption, peers map[string]pb.Se
Cluster: cluster.NewCluster(), Cluster: cluster.NewCluster(),
} }
ms.boundedLeaderChan = make(chan int, 16) ms.boundedLeaderChan = make(chan int, 16)
ms.onPeerUpdatDoneCn = make(chan string) ms.onPeerUpdateDoneCn = make(chan string)
ms.MasterClient.OnPeerUpdate = ms.OnPeerUpdate ms.MasterClient.OnPeerUpdate = ms.OnPeerUpdate
@ -366,14 +366,15 @@ func (ms *MasterServer) OnPeerUpdate(update *master_pb.ClusterNodeUpdate, startF
hashicorpRaft.ServerAddress(peerAddress.ToGrpcAddress()), 0, 0) hashicorpRaft.ServerAddress(peerAddress.ToGrpcAddress()), 0, 0)
} }
} }
if ms.onPeerUpdatDoneCnExist { if ms.onPeerUpdateDoneCnExist {
ms.onPeerUpdatDoneCn <- peerName ms.onPeerUpdateDoneCn <- peerName
} }
} else if isLeader { } else if isLeader {
go func(peerName string) { go func(peerName string) {
raftServerRemovalTimeAfter := time.After(RaftServerRemovalTime)
for { for {
select { select {
case <-time.After(RaftServerRemovalTime): case <-raftServerRemovalTimeAfter:
err := ms.MasterClient.WithClient(false, func(client master_pb.SeaweedClient) error { err := ms.MasterClient.WithClient(false, func(client master_pb.SeaweedClient) error {
_, err := client.RaftRemoveServer(context.Background(), &master_pb.RaftRemoveServerRequest{ _, err := client.RaftRemoveServer(context.Background(), &master_pb.RaftRemoveServerRequest{
Id: peerName, Id: peerName,
@ -384,14 +385,16 @@ func (ms *MasterServer) OnPeerUpdate(update *master_pb.ClusterNodeUpdate, startF
if err != nil { if err != nil {
glog.Warningf("failed to removing old raft server %s: %v", peerName, err) glog.Warningf("failed to removing old raft server %s: %v", peerName, err)
} }
glog.V(0).Infof("old raft server %s removed", peerName)
return return
case peerDone := <-ms.onPeerUpdatDoneCn: case peerDone := <-ms.onPeerUpdateDoneCn:
if peerName == peerDone { if peerName == peerDone {
glog.V(0).Infof("raft server %s remove canceled", peerName)
return return
} }
} }
} }
}(peerName) }(peerName)
ms.onPeerUpdatDoneCnExist = true ms.onPeerUpdateDoneCnExist = true
} }
} }