Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow to use common balancer in child drivers #1530

Merged
merged 6 commits into from
Oct 25, 2024
Merged

allow to use common balancer in child drivers #1530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7d2b5ac
USe common balancer in child drivers
Oct 25, 2024
ae32ddb
Apply suggestions from code review
asmyasnikov Oct 25, 2024
da0f282
Apply suggestions from code review
asmyasnikov Oct 25, 2024
b895142
rollback code
Oct 25, 2024
49287c9
Move WithSharedBalancer option upper
Oct 25, 2024
8b810e4
fix error check
Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
* Added option `ydb.WithSharedBalancer(*Driver)` for child drivers

## v3.89.0
* Fixed send optional arguments to the server with `ydb.ParamsBuilder`

Expand Down
9 changes: 5 additions & 4 deletions driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,10 +415,11 @@ func (d *Driver) connect(ctx context.Context) (err error) {
if d.pool == nil {
d.pool = conn.NewPool(ctx, d.config)
}

d.balancer, err = balancer.New(ctx, d.config, d.pool, d.discoveryOptions...)
if err != nil {
return xerrors.WithStackTrace(err)
if d.balancer == nil {
d.balancer, err = balancer.New(ctx, d.config, d.pool, d.discoveryOptions...)
if err != nil {
return xerrors.WithStackTrace(err)
}
}

d.table = xsync.OnceValue(func() (*internalTable.Client, error) {
Expand Down
9 changes: 9 additions & 0 deletions options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,15 @@ func WithPanicCallback(panicCallback func(e interface{})) Option {
}
}

// WithSharedBalancer sets balancer from parent driver to child driver
func WithSharedBalancer(parent *Driver) Option {
return func(ctx context.Context, c *Driver) error {
c.balancer = parent.balancer

return nil
}
}

// WithTraceTable appends trace.Table into table traces
func WithTraceTable(t trace.Table, opts ...trace.TableComposeOption) Option { //nolint:gocritic
return func(ctx context.Context, c *Driver) error {
Expand Down
Loading