From b2a828a4cd1d4cd3995e41287edf9c8a74be28bb Mon Sep 17 00:00:00 2001 From: Shanth Sathiyaseelan Date: Wed, 15 Nov 2023 19:08:36 +0000 Subject: [PATCH] don't set options in vdiff resume Signed-off-by: Shanth Sathiyaseelan --- go/vt/vttablet/tabletmanager/vdiff/action.go | 2 +- go/vt/vttablet/tabletmanager/vdiff/schema.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/go/vt/vttablet/tabletmanager/vdiff/action.go b/go/vt/vttablet/tabletmanager/vdiff/action.go index 2966f2be0b6..01304917a1a 100644 --- a/go/vt/vttablet/tabletmanager/vdiff/action.go +++ b/go/vt/vttablet/tabletmanager/vdiff/action.go @@ -190,7 +190,7 @@ func (vde *Engine) handleCreateResumeAction(ctx context.Context, dbClient binlog } resp.Id = int64(qr.InsertID) } else { - query := fmt.Sprintf(sqlResumeVDiff, encodeString(string(optionsJSON)), encodeString(req.VdiffUuid)) + query := fmt.Sprintf(sqlResumeVDiff, encodeString(req.VdiffUuid)) if qr, err = dbClient.ExecuteFetch(query, 1); err != nil { return err } diff --git a/go/vt/vttablet/tabletmanager/vdiff/schema.go b/go/vt/vttablet/tabletmanager/vdiff/schema.go index 17ad055f2a8..d32d7e19276 100644 --- a/go/vt/vttablet/tabletmanager/vdiff/schema.go +++ b/go/vt/vttablet/tabletmanager/vdiff/schema.go @@ -82,7 +82,7 @@ const ( primary key (id)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4` sqlNewVDiff = "insert into _vt.vdiff(keyspace, workflow, state, options, shard, db_name, vdiff_uuid) values(%s, %s, '%s', %s, '%s', '%s', '%s')" - sqlResumeVDiff = `update _vt.vdiff as vd, _vt.vdiff_table as vdt set vd.options = %s, vd.started_at = NULL, vd.completed_at = NULL, vd.state = 'pending', + sqlResumeVDiff = `update _vt.vdiff as vd, _vt.vdiff_table as vdt set vd.started_at = NULL, vd.completed_at = NULL, vd.state = 'pending', vdt.state = 'pending' where vd.vdiff_uuid = %s and vd.id = vdt.vdiff_id and vd.state in ('completed', 'stopped') and vdt.state in ('completed', 'stopped')` sqlRetryVDiff = `update _vt.vdiff as vd left join _vt.vdiff_table as vdt on (vd.id = vdt.vdiff_id) set vd.state = 'pending',