txthrottler: further code cleanup (vitessio#12902)

* txthrottler: further code cleanup Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * Fix bad merge resolution Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> --------- Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
slackhq · Jun 28, 2023 · 5a4a8c9 · 5a4a8c9
1 parent c322ded
commit 5a4a8c9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/go/vt/vttablet/tabletserver/txthrottler/tx_throttler.go b/go/vt/vttablet/tabletserver/txthrottler/tx_throttler.go
@@ -249,7 +249,7 @@ func (t *txThrottler) Open() (err error) {
  }
  log.Info("txThrottler: opening")
  t.throttlerRunning.Set(1)
- t.state, err = newTxThrottlerState(t.topoServer, t.config, t.target.Keyspace, t.target.Shard, t.target.Cell)
+ t.state, err = newTxThrottlerState(t.topoServer, t.config, t.target)
  return err
 }
 
@@ -294,7 +294,7 @@ func (t *txThrottler) Throttle(priority int) (result bool) {
  return result
 }
 
-func newTxThrottlerState(topoServer *topo.Server, config *txThrottlerConfig, keyspace, shard, cell string) (*txThrottlerState, error) {
+func newTxThrottlerState(topoServer *topo.Server, config *txThrottlerConfig, target *querypb.Target) (*txThrottlerState, error) {
  maxReplicationLagModuleConfig := throttler.MaxReplicationLagModuleConfig{Configuration: config.throttlerConfig}
 
  t, err := throttlerFactory(
@@ -325,8 +325,8 @@ func newTxThrottlerState(topoServer *topo.Server, config *txThrottlerConfig, key
  topoServer,
  result.healthCheck, /* LegacyTabletRecorder */
  cell,
- keyspace,
- shard,
+ target.Keyspace,
+ target.Shard,
  discovery.DefaultTopologyWatcherRefreshInterval,
  discovery.DefaultTopoReadConcurrency))
  }