Skip to content

Fix Reshard Cancel behavior #18020

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

Merged
rohit-nayak-ps merged 4 commits into from
Mar 31, 2025
Merged

Fix Reshard Cancel behavior #18020

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b22056d
Only drop tables in the target shards, not the target shards themselves.
arthurschreiber Mar 24, 2025
2ef6f95
Expose `--keep-data` flag on `Reshard Cancel` command.
arthurschreiber Mar 24, 2025
01e17e7
Fixups.
arthurschreiber Mar 24, 2025
1c335ab
Add a reshard cancel test.
arthurschreiber Mar 25, 2025
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
5 changes: 4 additions & 1 deletion go/cmd/vtctldclient/command/vreplication/reshard/reshard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,10 @@ func registerReshardCommands(root *cobra.Command) {
reshard.AddCommand(reverseTrafficCommand)

reshard.AddCommand(common.GetCompleteCommand(opts))
reshard.AddCommand(common.GetCancelCommand(opts))

cancel := common.GetCancelCommand(opts)
cancel.Flags().BoolVar(&common.CancelOptions.KeepData, "keep-data", false, "Keep the partially copied table data from the Reshard workflow in the target shards.")
reshard.AddCommand(cancel)
}

func init() {
Expand Down
2 changes: 1 addition & 1 deletion go/vt/vtctl/workflow/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1990,7 +1990,7 @@ func (s *Server) dropTargets(ctx context.Context, ts *trafficSwitcher, keepData,
return nil, err
}
case binlogdatapb.MigrationType_SHARDS:
if err := sw.dropTargetShards(ctx); err != nil {
if err := sw.removeTargetTables(ctx); err != nil {
Comment thread
arthurschreiber marked this conversation as resolved.
return nil, err
}
}
Expand Down