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

VDiff: Cleanup the controller for a VDiff before deleting it #14107

Merged
merged 8 commits into from
Sep 28, 2023
Merged

VDiff: Cleanup the controller for a VDiff before deleting it #14107

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e55bcbb
Stop the controller for a VDiff before deleting it
mattlord Sep 27, 2023
ddd7305
Update unit test
mattlord Sep 28, 2023
d109c17
Nit after self review
mattlord Sep 28, 2023
3341f60
Changes and fixes after more manual testing
mattlord Sep 28, 2023
81768ec
Minor changes after self review
mattlord Sep 28, 2023
d2ab63f
Reuse VDiff RPC to delete vdiffs on workflow cleanup
mattlord Sep 28, 2023
ac7729d
Add tmc impls
mattlord Sep 28, 2023
8f25f73
Minor tweaks after self review
mattlord Sep 28, 2023
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
4 changes: 2 additions & 2 deletions go/test/endtoend/vreplication/vdiff2_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,11 @@ func testWorkflow(t *testing.T, vc *VitessCluster, tc *testCase, tks *Keyspace,
vdiff(t, tc.targetKs, tc.workflow, allCellNames, true, true, nil)

if tc.autoRetryError {
testAutoRetryError(t, tc, cells[0].Name)
testAutoRetryError(t, tc, allCellNames)
}

if tc.resume {
testResume(t, tc, cells[0].Name)
testResume(t, tc, allCellNames)
Comment on lines -193 to +197
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes aren't necessary (as it's vtctlclient only and we don't update the stored values except for the create command), but changing them to match.

}

// These are done here so that we have a valid workflow to test the commands against
Expand Down
25 changes: 25 additions & 0 deletions go/vt/vttablet/tabletmanager/vdiff/action.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,9 +354,13 @@ func (vde *Engine) handleStopAction(ctx context.Context, dbClient binlogplayer.D
func (vde *Engine) handleDeleteAction(ctx context.Context, dbClient binlogplayer.DBClient, action VDiffAction, req *tabletmanagerdatapb.VDiffRequest, resp *tabletmanagerdatapb.VDiffResponse) error {
var err error
query := ""
vde.mu.Lock()
defer vde.mu.Unlock()

switch req.ActionArg {
case AllActionArg:
// We need to stop all running controllers.
vde.resetControllers()
query, err = sqlparser.ParseAndBind(sqlDeleteVDiffs,
sqltypes.StringBindVariable(req.Keyspace),
sqltypes.StringBindVariable(req.Workflow),
Expand All @@ -369,6 +373,27 @@ func (vde *Engine) handleDeleteAction(ctx context.Context, dbClient binlogplayer
if err != nil {
return fmt.Errorf("action argument %s not supported", req.ActionArg)
}
// We need to be sure that the controller is cleaned up, if it's
// still running, before we delete the vdiff record.
query, err = sqlparser.ParseAndBind(sqlGetVDiffID,
sqltypes.StringBindVariable(uuid.String()),
)
if err != nil {
return err
}
res, err := dbClient.ExecuteFetch(query, 1)
if err != nil {
return err
}
row := res.Named().Row() // Must only be one
if row == nil {
return vterrors.Errorf(vtrpcpb.Code_FAILED_PRECONDITION, "no vdiff found for UUID %s keyspace %s and workflow %s on tablet %v",
uuid, req.Keyspace, req.Workflow, vde.thisTablet.Alias)
}
controller, ok := vde.controllers[int64(row.AsInt64("id", 0))]
if ok {
controller.Stop()
}
query, err = sqlparser.ParseAndBind(sqlDeleteVDiffByUUID, sqltypes.StringBindVariable(uuid.String()))
if err != nil {
return err
Expand Down
Loading