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

avoid repeated grpc connection creation

Browse source 
fix https://github.com/chrislusf/seaweedfs/issues/1277
This commit is contained in:
Chris Lu 2020-04-22 18:26:24 -07:00
parent 5d0e1d8d74
commit aebe39a803
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
weed/pb/grpc_client_server.go
View file

@ -86,13 +86,15 @@ func WithCachedGrpcClient(fn func(*grpc.ClientConn) error, address string, opts
err := fn(existingConnection) err := fn(existingConnection)
if err != nil { if err != nil {
grpcClientsLock.Lock() grpcClientsLock.Lock()
delete(grpcClients, address) // delete(grpcClients, address)
grpcClientsLock.Unlock() grpcClientsLock.Unlock()
existingConnection.Close() // println("closing existing connection to", existingConnection.Target())
// existingConnection.Close()
} }
return err return err
} }
println(" dialing to", address, "...")
grpcConnection, err := GrpcDial(context.Background(), address, opts...) grpcConnection, err := GrpcDial(context.Background(), address, opts...)
if err != nil { if err != nil {
grpcClientsLock.Unlock() grpcClientsLock.Unlock()
@ -105,9 +107,10 @@ func WithCachedGrpcClient(fn func(*grpc.ClientConn) error, address string, opts
err = fn(grpcConnection) err = fn(grpcConnection)
if err != nil { if err != nil {
grpcClientsLock.Lock() grpcClientsLock.Lock()
delete(grpcClients, address) // delete(grpcClients, address)
grpcClientsLock.Unlock() grpcClientsLock.Unlock()
grpcConnection.Close() // println("closing created new connection to", grpcConnection.Target())
// grpcConnection.Close()
} }
return err return err

3
weed/wdclient/masterclient.go
View file

@ -121,6 +121,9 @@ func (mc *MasterClient) tryConnectToMaster(master string) (nextHintedLeader stri
} }
func (mc *MasterClient) WithClient(fn func(client master_pb.SeaweedClient) error) error { func (mc *MasterClient) WithClient(fn func(client master_pb.SeaweedClient) error) error {
for mc.currentMaster == "" {
time.Sleep(3 * time.Second)
}
return pb.WithMasterClient(mc.currentMaster, mc.grpcDialOption, func(client master_pb.SeaweedClient) error { return pb.WithMasterClient(mc.currentMaster, mc.grpcDialOption, func(client master_pb.SeaweedClient) error {
return fn(client) return fn(client)
}) })