From fe2520db276a40ddf05667be355efb1b0f0654ea Mon Sep 17 00:00:00 2001 From: Michael Demmer Date: Mon, 8 Jul 2024 14:08:05 -0700 Subject: [PATCH] one more refactor to align more with upstream --- go/vt/vtgate/tabletgateway.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/go/vt/vtgate/tabletgateway.go b/go/vt/vtgate/tabletgateway.go index 0f1ac0dbfe4..b2674e96a8d 100644 --- a/go/vt/vtgate/tabletgateway.go +++ b/go/vt/vtgate/tabletgateway.go @@ -75,17 +75,12 @@ func init() { }) } -func useBalancer(keyspace string) bool { - if balancerEnabled { - if len(balancerKeyspaces) == 0 { +// this utility can be replaced with slices.Contains in a future iteration +func isBalancerKeyspaceEnabled(keyspace string) bool { + for _, k := range balancerKeyspaces { + if keyspace == k { return true } - - for _, k := range balancerKeyspaces { - if keyspace == k { - return true - } - } } return false @@ -373,7 +368,12 @@ func (gw *TabletGateway) withRetry(ctx context.Context, target *querypb.Target, } var th *discovery.TabletHealth - if useBalancer(target.Keyspace) { + + useBalancer := balancerEnabled + if balancerEnabled && len(balancerKeyspaces) > 0 { + useBalancer = isBalancerKeyspaceEnabled(target.Keyspace) + } + if useBalancer { // filter out the tablets that we've tried before (if any), then pick the best one if len(invalidTablets) > 0 { validTablets := make([]*discovery.TabletHealth, len(tablets))