[#282] client: Close connection on non-nil error in Dial
All checks were successful
DCO / DCO (pull_request) Successful in 1m19s
Tests and linters / Tests (pull_request) Successful in 1m22s
Tests and linters / Lint (pull_request) Successful in 1m52s

A particular status code does not imply that connection has not been
established. However, `Dial()` requires user to call `Close()` only if
the error was nil. Thus, it is `Dial()` responsibility to close
everything if it returns an error.

Introduced after the gRPC update in #270 (6009d089fc).

Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
This commit is contained in:
Evgenii Stratonikov 2024-10-10 14:00:54 +03:00
parent 4c310ae1c7
commit 1b1adb9600
Signed by: fyrchik
SSH key fingerprint: SHA256:m/TTwCzjnRkXgnzEx9X92ccxy1CcVeinOgDb3NPWWmg

View file

@ -106,16 +106,21 @@ func (c *Client) Dial(ctx context.Context, prm PrmDial) error {
client.WithContext(ctx), client.WithContext(ctx),
) )
if err != nil { if err != nil {
var ctxErr error
// return context errors since they signal about dial problem // return context errors since they signal about dial problem
if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) { if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
return err ctxErr = err
} else if st, ok := status.FromError(err); ok && st.Code() == codes.Canceled {
ctxErr = context.Canceled
} else if ok && st.Code() == codes.DeadlineExceeded {
ctxErr = context.DeadlineExceeded
} }
st, ok := status.FromError(err) if ctxErr != nil {
if ok && st.Code() == codes.Canceled { if conn := c.c.Conn(); conn != nil {
return context.Canceled _ = conn.Close()
} }
if ok && st.Code() == codes.DeadlineExceeded { return ctxErr
return context.DeadlineExceeded
} }
} }