Merge pull request #1541 from ydb-platform/fix-close

* Fixed closing of child driver with shared balancer

Author: neyguvj

CHANGELOG.md

@@ -1,3 +1,5 @@
+* Fixed closing of child driver with shared balancer
+
 ## v3.89.6
 * Refactored `database/sql` driver internals for query-service client support in the future 
 

driver.go

@@ -109,6 +109,7 @@ type (
 	balancerWithMeta struct {
 		balancer *balancer.Balancer
 		meta     *meta.Meta
+		close    func(ctx context.Context) error
 	}
 )
 
@@ -134,6 +135,10 @@ func (b *balancerWithMeta) NewStream(ctx context.Context, desc *grpc.StreamDesc,
 	return b.balancer.NewStream(metaCtx, desc, method, opts...)
 }
 
+func (b *balancerWithMeta) Close(ctx context.Context) error {
+	return b.close(ctx)
+}
+
 // Close closes Driver and clear resources
 //
 //nolint:nonamedreturns
@@ -176,7 +181,7 @@ func (d *Driver) Close(ctx context.Context) (finalErr error) {
 		d.query.Close,
 		d.topic.Close,
 		d.discovery.Close,
-		d.metaBalancer.balancer.Close,
+		d.metaBalancer.Close,
 		d.pool.Release,
 	)
 
@@ -278,7 +283,7 @@ func Open(ctx context.Context, dsn string, opts ...Option) (_ *Driver, _ error)
 		}
 	}
 
-	d, err := newConnectionFromOptions(ctx, opts...)
+	d, err := driverFromOptions(ctx, opts...)
 	if err != nil {
 		return nil, xerrors.WithStackTrace(err)
 	}
@@ -320,7 +325,7 @@ func MustOpen(ctx context.Context, dsn string, opts ...Option) *Driver {
 // Will be removed after Oct 2024.
 // Read about versioning policy: https://github.com/ydb-platform/ydb-go-sdk/blob/master/VERSIONING.md#deprecated
 func New(ctx context.Context, opts ...Option) (_ *Driver, err error) { //nolint:nonamedreturns
-	d, err := newConnectionFromOptions(ctx, opts...)
+	d, err := driverFromOptions(ctx, opts...)
 	if err != nil {
 		return nil, xerrors.WithStackTrace(err)
 	}
@@ -342,7 +347,7 @@ func New(ctx context.Context, opts ...Option) (_ *Driver, err error) { //nolint:
 }
 
 //nolint:cyclop, nonamedreturns, funlen
-func newConnectionFromOptions(ctx context.Context, opts ...Option) (_ *Driver, err error) {
+func driverFromOptions(ctx context.Context, opts ...Option) (_ *Driver, err error) {
 	ctx, driverCtxCancel := xcontext.WithCancel(xcontext.ValueOnly(ctx))
 	defer func() {
 		if err != nil {
@@ -444,6 +449,7 @@ func (d *Driver) connect(ctx context.Context) (err error) {
 			return xerrors.WithStackTrace(err)
 		}
 		d.metaBalancer.balancer = b
+		d.metaBalancer.close = b.Close
 	}
 	d.metaBalancer.meta = d.config.Meta()
 

dsn_test.go

@@ -178,7 +178,7 @@ func TestParse(t *testing.T) {
 				require.ErrorIs(t, err, tt.err)
 			} else {
 				require.NoError(t, err)
-				d, err := newConnectionFromOptions(context.Background(), opts...)
+				d, err := driverFromOptions(context.Background(), opts...)
 				require.NoError(t, err)
 				exp := newConnector(tt.connectorOpts...)
 				act := newConnector(d.databaseSQLOptions...)

options.go

@@ -602,6 +602,7 @@ func WithPanicCallback(panicCallback func(e interface{})) Option {
 func WithSharedBalancer(parent *Driver) Option {
 	return func(ctx context.Context, d *Driver) error {
 		d.metaBalancer.balancer = parent.metaBalancer.balancer
+		d.metaBalancer.close = func(ctx context.Context) error { return nil }
 
 		return nil
 	}

tests/integration/connection_secure_test.go renamed to tests/integration/driver_secure_test.go

@@ -32,11 +32,12 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xtest"
 	"github.com/ydb-platform/ydb-go-sdk/v3/log"
 	"github.com/ydb-platform/ydb-go-sdk/v3/retry"
+	"github.com/ydb-platform/ydb-go-sdk/v3/table/result/indexed"
 	"github.com/ydb-platform/ydb-go-sdk/v3/trace"
 )
 
 //nolint:gocyclo
-func TestConnection(sourceTest *testing.T) {
+func TestDriver(sourceTest *testing.T) {
 	t := xtest.MakeSyncedTest(sourceTest)
 	const sumColumn = "sum"
 	var (
@@ -164,6 +165,22 @@ func TestConnection(sourceTest *testing.T) {
 				t.Fatalf("close failed: %+v", e)
 			}
 		}()
+		t.Run("With", func(t *testing.T) {
+			t.Run("WithSharedBalancer", func(t *testing.T) {
+				child, err := db.With(ctx, ydb.WithSharedBalancer(db))
+				require.NoError(t, err)
+				result, err := child.Scripting().Execute(ctx, `SELECT 1`, nil)
+				require.NoError(t, err)
+				require.NoError(t, result.NextResultSetErr(ctx))
+				require.True(t, result.NextRow())
+				var value int32
+				err = result.Scan(indexed.Required(&value))
+				require.NoError(t, err)
+				require.EqualValues(t, 1, value)
+				err = child.Close(ctx)
+				require.NoError(t, err)
+			})
+		})
 		t.Run("discovery.WhoAmI", func(t *testing.T) {
 			if err = retry.Retry(ctx, func(ctx context.Context) (err error) {
 				discoveryClient := Ydb_Discovery_V1.NewDiscoveryServiceClient(ydb.GRPCConn(db))

tests/integration/connection_test.go renamed to tests/integration/driver_test.go

@@ -14,7 +14,7 @@ var nextID atomic.Uint64 //nolint:gochecknoglobals
 func (d *Driver) with(ctx context.Context, opts ...Option) (*Driver, uint64, error) {
 	id := nextID.Add(1)
 
-	child, err := newConnectionFromOptions(
+	child, err := driverFromOptions(
 		ctx,
 		append(
 			append(

with.go

@@ -128,7 +128,7 @@ func TestWithCertificatesCached(t *testing.T) {
 		},
 	} {
 		t.Run(test.name, func(t *testing.T) {
-			db, err := newConnectionFromOptions(ctx,
+			db, err := driverFromOptions(ctx,
 				append(
 					test.options,
 					withConnPool(conn.NewPool(context.Background(), config.New())), //nolint:contextcheck