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

refactoring

Browse source
This commit is contained in:
Chris Lu 2020-07-03 22:25:35 -07:00
parent ce3630e7a4
commit 353bea8ddb
1 changed files with 12 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
weed/pb/grpc_client_server.go
View file

@ -76,43 +76,33 @@ func GrpcDial(ctx context.Context, address string, opts ...grpc.DialOption) (*gr
return grpc.DialContext(ctx, address, options...)
}
func WithCachedGrpcClient(fn func(*grpc.ClientConn) error, address string, opts ...grpc.DialOption) error {
func getOrCreateConnection(address string, opts ...grpc.DialOption) (*grpc.ClientConn, error) {
grpcClientsLock.Lock()
defer grpcClientsLock.Unlock()
existingConnection, found := grpcClients[address]
if found {
grpcClientsLock.Unlock()
err := fn(existingConnection)
if err != nil {
grpcClientsLock.Lock()
// delete(grpcClients, address)
grpcClientsLock.Unlock()
// println("closing existing connection to", existingConnection.Target())
// existingConnection.Close()
}
return err
return existingConnection, nil
}
grpcConnection, err := GrpcDial(context.Background(), address, opts...)
if err != nil {
grpcClientsLock.Unlock()
return fmt.Errorf("fail to dial %s: %v", address, err)
return nil, fmt.Errorf("fail to dial %s: %v", address, err)
}
grpcClients[address] = grpcConnection
grpcClientsLock.Unlock()
err = fn(grpcConnection)
return grpcConnection, nil
}
func WithCachedGrpcClient(fn func(*grpc.ClientConn) error, address string, opts ...grpc.DialOption) error {
grpcConnection, err := getOrCreateConnection(address, opts...)
if err != nil {
grpcClientsLock.Lock()
// delete(grpcClients, address)
grpcClientsLock.Unlock()
// println("closing created new connection to", grpcConnection.Target())
// grpcConnection.Close()
return fmt.Errorf("getOrCreateConnection %s: %v", address, err)
}
return err
return fn(grpcConnection)
}
func ParseServerToGrpcAddress(server string) (serverGrpcAddress string, err error) {