fix closing of table client

Author: asmyasnikov

internal/table/client.go

@@ -138,54 +138,63 @@ func (c *Client) createSession(ctx context.Context, opts ...createSessionOption)
 		return nil, xerrors.WithStackTrace(errClosedClient)
 	}
 
-	c.spawnedGoroutines.Add(1)
-	go func() {
-		defer c.spawnedGoroutines.Done()
-
-		var (
-			s   *session
-			err error
-		)
-
-		createSessionCtx := xcontext.WithoutDeadline(ctx)
+	select {
+	case <-c.done:
+		return nil, xerrors.WithStackTrace(errClosedClient)
 
-		if timeout := c.config.CreateSessionTimeout(); timeout > 0 {
-			var cancel context.CancelFunc
-			createSessionCtx, cancel = context.WithTimeout(createSessionCtx, timeout)
-			defer cancel()
-		}
+	case <-ctx.Done():
+		return nil, xerrors.WithStackTrace(ctx.Err())
 
-		s, err = c.build(createSessionCtx)
+	default:
+		c.spawnedGoroutines.Add(1)
+		go func() {
+			defer c.spawnedGoroutines.Done()
 
-		closeSession := func(s *session) {
-			if s == nil {
-				return
-			}
+			var (
+				s   *session
+				err error
+			)
 
-			closeSessionCtx := xcontext.WithoutDeadline(ctx)
+			createSessionCtx := xcontext.WithoutDeadline(ctx)
 
-			if timeout := c.config.DeleteTimeout(); timeout > 0 {
+			if timeout := c.config.CreateSessionTimeout(); timeout > 0 {
 				var cancel context.CancelFunc
-				createSessionCtx, cancel = context.WithTimeout(closeSessionCtx, timeout)
+				createSessionCtx, cancel = context.WithTimeout(createSessionCtx, timeout)
 				defer cancel()
 			}
 
-			_ = s.Close(ctx)
-		}
+			s, err = c.build(createSessionCtx)
 
-		select {
-		case ch <- result{
-			s:   s,
-			err: err,
-		}: // nop
+			closeSession := func(s *session) {
+				if s == nil {
+					return
+				}
 
-		case <-c.done:
-			closeSession(s)
+				closeSessionCtx := xcontext.WithoutDeadline(ctx)
 
-		case <-ctx.Done():
-			closeSession(s)
-		}
-	}()
+				if timeout := c.config.DeleteTimeout(); timeout > 0 {
+					var cancel context.CancelFunc
+					createSessionCtx, cancel = context.WithTimeout(closeSessionCtx, timeout)
+					defer cancel()
+				}
+
+				_ = s.Close(ctx)
+			}
+
+			select {
+			case ch <- result{
+				s:   s,
+				err: err,
+			}: // nop
+
+			case <-c.done:
+				closeSession(s)
+
+			case <-ctx.Done():
+				closeSession(s)
+			}
+		}()
+	}
 
 	select {
 	case <-c.done: