From 22cf1e0b893b12c21fbf97b88260d55d968053b0 Mon Sep 17 00:00:00 2001 From: Rohit Nayak Date: Tue, 28 Jan 2025 20:56:44 +0100 Subject: [PATCH] Remove unnecessary param Signed-off-by: Rohit Nayak --- go/vt/vttablet/tabletmanager/vdiff/controller.go | 2 +- go/vt/vttablet/tabletmanager/vdiff/engine.go | 2 +- go/vt/vttablet/tabletmanager/vdiff/framework_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go/vt/vttablet/tabletmanager/vdiff/controller.go b/go/vt/vttablet/tabletmanager/vdiff/controller.go index 31316d8431a..7b5e1311066 100644 --- a/go/vt/vttablet/tabletmanager/vdiff/controller.go +++ b/go/vt/vttablet/tabletmanager/vdiff/controller.go @@ -83,7 +83,7 @@ type controller struct { TableDiffPhaseTimings *stats.Timings } -func newController(ctx context.Context, row sqltypes.RowNamedValues, dbClientFactory func() binlogplayer.DBClient, +func newController(row sqltypes.RowNamedValues, dbClientFactory func() binlogplayer.DBClient, ts *topo.Server, vde *Engine, options *tabletmanagerdata.VDiffOptions) (*controller, error) { log.Infof("VDiff controller initializing for %+v", row) diff --git a/go/vt/vttablet/tabletmanager/vdiff/engine.go b/go/vt/vttablet/tabletmanager/vdiff/engine.go index 7cd486a55e4..e3abe651c58 100644 --- a/go/vt/vttablet/tabletmanager/vdiff/engine.go +++ b/go/vt/vttablet/tabletmanager/vdiff/engine.go @@ -212,7 +212,7 @@ func (vde *Engine) retry(ctx context.Context, err error) { // addController creates a new controller using the given vdiff record and adds it to the engine. // You must already have the main engine mutex (mu) locked before calling this. func (vde *Engine) addController(row sqltypes.RowNamedValues, options *tabletmanagerdata.VDiffOptions) error { - ct, err := newController(vde.ctx, row, vde.dbClientFactoryDba, vde.ts, vde, options) + ct, err := newController(row, vde.dbClientFactoryDba, vde.ts, vde, options) if err != nil { return fmt.Errorf("controller could not be initialized for stream %+v on tablet %v", row, vde.thisTablet.Alias) diff --git a/go/vt/vttablet/tabletmanager/vdiff/framework_test.go b/go/vt/vttablet/tabletmanager/vdiff/framework_test.go index 78f50e3d182..4c1c7e8f3b8 100644 --- a/go/vt/vttablet/tabletmanager/vdiff/framework_test.go +++ b/go/vt/vttablet/tabletmanager/vdiff/framework_test.go @@ -693,7 +693,7 @@ func (tvde *testVDiffEnv) createController(t *testing.T, id int) *controller { func (tvde *testVDiffEnv) newController(t *testing.T, controllerQR *sqltypes.Result) *controller { ctx := context.Background() - ct, err := newController(ctx, controllerQR.Named().Row(), tvde.dbClientFactory, tstenv.TopoServ, tvde.vde, tvde.opts) + ct, err := newController(controllerQR.Named().Row(), tvde.dbClientFactory, tstenv.TopoServ, tvde.vde, tvde.opts) require.NoError(t, err) ctx2, cancel := context.WithCancel(ctx) ct.cancel = cancel