lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-12-21 11:00:08 +08:00
Code Issues Actions 16 Packages Projects Releases Wiki Activity

Revert "master: rename grpc function KeepConnected() to SubscribeVolumeLocationUpdates()"

Browse Source 
This reverts commit af71ae11aa.
This commit is contained in:
Chris Lu
2021-11-05 17:52:15 -07:00
parent 314c32514b
commit 5ea86ef1da
16 changed files with 687 additions and 696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
weed/server/master_grpc_server.go
View File

@@ -176,9 +176,9 @@ func (ms *MasterServer) SendHeartbeat(stream master_pb.Seaweed_SendHeartbeatServ
}
}
// SubscribeVolumeLocationUpdates keep a stream gRPC call to the master. Used by clients to know the master is up.
// KeepConnected keep a stream gRPC call to the master. Used by clients to know the master is up.
// And clients gets the up-to-date list of volume locations
func (ms *MasterServer) SubscribeVolumeLocationUpdates(stream master_pb.Seaweed_SubscribeVolumeLocationUpdatesServer) error {
func (ms *MasterServer) KeepConnected(stream master_pb.Seaweed_KeepConnectedServer) error {
req, recvErr := stream.Recv()
if recvErr != nil {
@@ -238,7 +238,7 @@ func (ms *MasterServer) SubscribeVolumeLocationUpdates(stream master_pb.Seaweed_
}
func (ms *MasterServer) informNewLeader(stream master_pb.Seaweed_SubscribeVolumeLocationUpdatesServer) error {
func (ms *MasterServer) informNewLeader(stream master_pb.Seaweed_KeepConnectedServer) error {
leader, err := ms.Topo.Leader()
if err != nil {
glog.Errorf("topo leader: %v", err)
@@ -257,7 +257,7 @@ func (ms *MasterServer) addClient(clientType string, clientAddress pb.ServerAddr
glog.V(0).Infof("+ client %v", clientName)
// we buffer this because otherwise we end up in a potential deadlock where
// the SubscribeVolumeLocationUpdates loop is no longer listening on this channel but we're
// 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