diff options
| author | Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> | 2022-05-03 00:13:57 +0500 |
|---|---|---|
| committer | Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> | 2022-05-03 00:13:57 +0500 |
| commit | d8925b4e832b9ed12deae0b9b94cd5f050f2f258 (patch) | |
| tree | a197c8619048285e87c89932666ec0c7b2434f40 /weed/server/master_grpc_server.go | |
| parent | 7640e650e5e647e6d6f3c8043c1e0a7442f154c7 (diff) | |
| parent | 998c1973eae6cbf5f91a80d3d6a864db91a3d38f (diff) | |
| download | seaweedfs-d8925b4e832b9ed12deae0b9b94cd5f050f2f258.tar.xz seaweedfs-d8925b4e832b9ed12deae0b9b94cd5f050f2f258.zip | |
Merge branch 'new_master' into ydb
# Conflicts:
# go.mod
# go.sum
Diffstat (limited to 'weed/server/master_grpc_server.go')
| -rw-r--r-- | weed/server/master_grpc_server.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/weed/server/master_grpc_server.go b/weed/server/master_grpc_server.go index 83abdaaad..981f663e4 100644 --- a/weed/server/master_grpc_server.go +++ b/weed/server/master_grpc_server.go @@ -201,13 +201,13 @@ func (ms *MasterServer) KeepConnected(stream master_pb.Seaweed_KeepConnectedServ // 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.ClientType, peerAddress) - for _, update := range ms.Cluster.AddClusterNode(req.ClientType, peerAddress, req.Version) { + clientName, messageChan := ms.addClient(req.FilerGroup, req.ClientType, peerAddress) + for _, update := range ms.Cluster.AddClusterNode(req.FilerGroup, req.ClientType, peerAddress, req.Version) { ms.broadcastToClients(update) } defer func() { - for _, update := range ms.Cluster.RemoveClusterNode(req.ClientType, peerAddress) { + for _, update := range ms.Cluster.RemoveClusterNode(req.FilerGroup, req.ClientType, peerAddress) { ms.broadcastToClients(update) } ms.deleteClient(clientName) @@ -276,8 +276,8 @@ func (ms *MasterServer) informNewLeader(stream master_pb.Seaweed_KeepConnectedSe return nil } -func (ms *MasterServer) addClient(clientType string, clientAddress pb.ServerAddress) (clientName string, messageChan chan *master_pb.KeepConnectedResponse) { - clientName = clientType + "@" + string(clientAddress) +func (ms *MasterServer) addClient(filerGroup, clientType string, clientAddress pb.ServerAddress) (clientName string, messageChan chan *master_pb.KeepConnectedResponse) { + clientName = filerGroup + "." + clientType + "@" + string(clientAddress) glog.V(0).Infof("+ client %v", clientName) // we buffer this because otherwise we end up in a potential deadlock where |