gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix deadlock caused by message chan blocked (#5639)

Browse Source
This commit is contained in:
LHHDZ
2024-06-03 22:42:40 +08:00
committed by GitHub
parent d8bde9b96e
commit 36b5b713ba
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
weed/server/master_grpc_server.go
View File

@@ -292,6 +292,12 @@ func (ms *MasterServer) KeepConnected(stream master_pb.Seaweed_KeepConnectedServ
_, err := stream.Recv() _, err := stream.Recv()
if err != nil { if err != nil {
glog.V(2).Infof("- client %v: %v", clientName, err) glog.V(2).Infof("- client %v: %v", clientName, err)
go func() {
// consume message chan to avoid deadlock, go routine exit when message chan is closed
for range messageChan {
// no op
}
}()
close(stopChan) close(stopChan)
return return
} }
@@ -367,6 +373,8 @@ func (ms *MasterServer) addClient(filerGroup, clientType string, clientAddress p
func (ms *MasterServer) deleteClient(clientName string) { func (ms *MasterServer) deleteClient(clientName string) {
glog.V(0).Infof("- client %v", clientName) glog.V(0).Infof("- client %v", clientName)
ms.clientChansLock.Lock() ms.clientChansLock.Lock()
// close message chan, so that the KeepConnected go routine can exit
close(ms.clientChans[clientName])
delete(ms.clientChans, clientName) delete(ms.clientChans, clientName)
ms.clientChansLock.Unlock() ms.clientChansLock.Unlock()
} }