wrapped closed context on closing sessions

internal/query/session_core.go

@@ -234,6 +234,10 @@ func (core *sessionCore) deleteSession(ctx context.Context) (finalErr error) {
 		onDone(finalErr)
 	}()
 
+	if err := ctx.Err(); err != nil {
+		return xerrors.WithStackTrace(err)
+	}
+
 	if d := core.deleteTimeout; d > 0 {
 		var cancel context.CancelFunc
 		ctx, cancel = xcontext.WithTimeout(ctx, d)

internal/table/session.go

@@ -357,6 +357,10 @@ func newTableSession( //nolint:funlen
 		status: table.SessionReady,
 		onClose: []func(s *Session) error{
 			func(s *Session) error {
+				if err := ctx.Err(); err != nil {
+					return xerrors.WithStackTrace(err)
+				}
+
 				_, err = s.client.DeleteSession(ctx,
 					&Ydb_Table.DeleteSessionRequest{
 						SessionId: s.id,
@@ -481,13 +485,18 @@ func (s *Session) Close(ctx context.Context) (err error) {
 		s.SetStatus(table.SessionClosed)
 	}()
 
+	errs := make([]error, 0, len(s.onClose))
 	for _, onClose := range s.onClose {
 		err := onClose(s)
 		if err != nil {
-			return xerrors.WithStackTrace(err)
+			errs = append(errs, err)
 		}
 	}
 
+	if len(errs) > 0 {
+		return xerrors.WithStackTrace(xerrors.Join(errs...))
+	}
+
 	return nil
 }