TrueCloudLab/frostfs-node
19
1
Fork 27
Code Issues 91 Pull requests 8 Projects Releases 1 Activity Actions

[#1213] morph/client: Unlock mutex to perform network requests

Browse source 
Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2022-03-15 14:32:25 +03:00 committed by Alex Vanin
parent 48eb87d32c
commit 61f60b8461
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkg/morph/client/multi.go
View file

@ -23,8 +23,6 @@ type multiClient struct {
} }
// createForAddress creates single Client instance using provided endpoint. // createForAddress creates single Client instance using provided endpoint.
//
// note: must be wrapped into mutex lock.
func (x *multiClient) createForAddress(addr string) (*Client, error) { func (x *multiClient) createForAddress(addr string) (*Client, error) {
cli, err := client.New(x.cfg.ctx, addr, client.Options{ cli, err := client.New(x.cfg.ctx, addr, client.Options{
DialTimeout: x.cfg.dialTimeout, DialTimeout: x.cfg.dialTimeout,
@ -39,15 +37,25 @@ func (x *multiClient) createForAddress(addr string) (*Client, error) {
return nil, err return nil, err
} }
var c *Client
x.clientsMtx.Lock()
// While creating 2 clients in parallel is ok, we don't want to
// use a client missing from `x.clients` map as it can lead
// to unexpected bugs.
if x.clients[addr] == nil {
sCli := blankSingleClient(cli, x.account, &x.cfg) sCli := blankSingleClient(cli, x.account, &x.cfg)
sCli.notary = x.sharedNotary sCli.notary = x.sharedNotary
c := &Client{ c = &Client{
cache: x.sharedCache, cache: x.sharedCache,
singleClient: sCli, singleClient: sCli,
} }
x.clients[addr] = c x.clients[addr] = c
} else {
c = x.clients[addr]
}
x.clientsMtx.Unlock()
return c, nil return c, nil
} }
@ -66,14 +74,12 @@ func (x *multiClient) iterateClients(f func(*Client) error) error {
} }
x.clientsMtx.Lock() x.clientsMtx.Lock()
c, cached := x.clients[x.endpoints[i]] c, cached := x.clients[x.endpoints[i]]
x.clientsMtx.Unlock()
if !cached { if !cached {
c, err = x.createForAddress(x.endpoints[i]) c, err = x.createForAddress(x.endpoints[i])
} }
x.clientsMtx.Unlock()
if !cached && err != nil { if !cached && err != nil {
x.cfg.logger.Error("could not open morph client connection", x.cfg.logger.Error("could not open morph client connection",
zap.String("endpoint", x.endpoints[i]), zap.String("endpoint", x.endpoints[i]),