diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2020-09-21 19:49:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-21 19:49:15 -0700 |
| commit | ec5b9f1e91a8609d0e70bf9d26dc0840774153c4 (patch) | |
| tree | 48ede45893c2130d3e039f7fe4af8440835eb02d /weed/server | |
| parent | 9cdbfc1a4987bdb46f16ae37624ed69ef66778a9 (diff) | |
| parent | 658fc2e5b619c453ddecc805bc363a25f75ff22d (diff) | |
| download | seaweedfs-ec5b9f1e91a8609d0e70bf9d26dc0840774153c4.tar.xz seaweedfs-ec5b9f1e91a8609d0e70bf9d26dc0840774153c4.zip | |
Merge pull request #1475 from levenlabs/lock
Fix deadlock with KeepConnected and SendHeartbeat
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/master_grpc_server.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/weed/server/master_grpc_server.go b/weed/server/master_grpc_server.go index f3a2ee013..692909a29 100644 --- a/weed/server/master_grpc_server.go +++ b/weed/server/master_grpc_server.go @@ -187,7 +187,8 @@ func (ms *MasterServer) KeepConnected(stream master_pb.Seaweed_KeepConnectedServ peerAddress := findClientAddress(stream.Context(), req.GrpcPort) - stopChan := make(chan bool) + // buffer by 1 so we don't end up getting stuck writing to stopChan forever + stopChan := make(chan bool, 1) clientName, messageChan := ms.addClient(req.Name, peerAddress) @@ -247,7 +248,12 @@ func (ms *MasterServer) addClient(clientType string, clientAddress string) (clie clientName = clientType + "@" + clientAddress glog.V(0).Infof("+ client %v", clientName) - messageChan = make(chan *master_pb.VolumeLocation) + // we buffer this because otherwise we end up in a potential deadlock where + // the KeepConnected loop is no longer listening on this channel but we're + // trying to send to it in SendHeartbeat and so we can't lock the + // clientChansLock to remove the channel and we're stuck writing to it + // 100 is probably overkill + messageChan = make(chan *master_pb.VolumeLocation, 100) ms.clientChansLock.Lock() ms.clientChans[clientName] = messageChan |