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.

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

VReplication: Support ignoring the source Keyspace on MoveTables cancel/complete #17729

Merged
merged 14 commits into from
Feb 25, 2025

Conversation

mattlord
Copy link
Contributor

@mattlord mattlord commented Feb 10, 2025

Description

As noted in the issue you may have a MoveTables workflow running for a long time with the traffic switched so that all traffic is going to the target keyspace. Then at some point someone may delete/decommission the source keyspace as it's no longer needed — before having completed the workflow. If that happens then there's no way to complete the workflow and a number of manual steps would be needed to cleanup the Topo Server and MySQL data associated with the workflow. This PR adds a --ignore-source-keyspace flag to the MoveTables complete, MoveTables cancel, and Workflow delete commands in order to support the cleanup work in these scenarios.

Manual tests:

cd examples/local
alias vtctldclient='command vtctldclient --server=localhost:15999' 

./101_initial_cluster.sh; ./201_customer_tablets.sh; ./202_move_tables.sh; ./203_switch_reads.sh; ./204_switch_writes.sh

for i in 100 101 102; do
        CELL=zone1 KEYSPACE=commerce TABLET_UID=$i ../common/scripts/vttablet-down.sh
done

vtctldclient --action_timeout 30s MoveTables --workflow commerce2customer --target-keyspace customer complete

vtctldclient MoveTables --workflow commerce2customer --target-keyspace customer complete --ignore-source-keyspace
./101_initial_cluster.sh; ./201_customer_tablets.sh; ./202_move_tables.sh; ./203_switch_reads.sh; ./204_switch_writes.sh

for i in 100 101 102; do
        CELL=zone1 KEYSPACE=commerce TABLET_UID=$i ../common/scripts/vttablet-down.sh
done

vtctldclient DeleteKeyspace commerce --recursive --force

vtctldclient --action_timeout 30s MoveTables --workflow commerce2customer --target-keyspace customer complete

vtctldclient MoveTables --workflow commerce2customer --target-keyspace customer complete --ignore-source-keyspace

Related Issue(s)

Checklist

  • "Backport to:" labels have been added if this change should be back-ported to release branches
  • If this change is to be back-ported to previous releases, a justification is included in the PR description
  • Tests were added or are not required
  • Did the new or modified tests pass consistently locally and on CI?
  • Documentation was added: Update docs for https://github.com/vitessio/vitess/pull/17729 website#1938

Signed-off-by: Matt Lord <mattalord@gmail.com>
@mattlord mattlord added Type: Enhancement Logical improvement (somewhere between a bug and feature) Component: VReplication labels Feb 10, 2025
Copy link
Contributor

vitess-bot bot commented Feb 10, 2025

Review Checklist

Hello reviewers! 👋 Please follow this checklist when reviewing this Pull Request.

General

  • Ensure that the Pull Request has a descriptive title.
  • Ensure there is a link to an issue (except for internal cleanup and flaky test fixes), new features should have an RFC that documents use cases and test cases.

Tests

  • Bug fixes should have at least one unit or end-to-end test, enhancement and new features should have a sufficient number of tests.

Documentation

  • Apply the release notes (needs details) label if users need to know about this change.
  • New features should be documented.
  • There should be some code comments as to why things are implemented the way they are.
  • There should be a comment at the top of each new or modified test to explain what the test does.

New flags

  • Is this flag really necessary?
  • Flag names must be clear and intuitive, use dashes (-), and have a clear help text.

If a workflow is added or modified:

  • Each item in Jobs should be named in order to mark it as required.
  • If the workflow needs to be marked as required, the maintainer team must be notified.

Backward compatibility

  • Protobuf changes should be wire-compatible.
  • Changes to _vt tables and RPCs need to be backward compatible.
  • RPC changes should be compatible with vitess-operator
  • If a flag is removed, then it should also be removed from vitess-operator and arewefastyet, if used there.
  • vtctl command output order should be stable and awk-able.

@vitess-bot vitess-bot bot added NeedsBackportReason If backport labels have been applied to a PR, a justification is required NeedsDescriptionUpdate The description is not clear or comprehensive enough, and needs work NeedsIssue A linked issue is missing for this Pull Request NeedsWebsiteDocsUpdate What it says labels Feb 10, 2025
@mattlord mattlord changed the title Support ignoring the source keyspace on MoveTables complete VReplication: Support ignoring the source Keyspace on MoveTables complete Feb 10, 2025
@github-actions github-actions bot added this to the v22.0.0 milestone Feb 10, 2025
Copy link

codecov bot commented Feb 10, 2025

Codecov Report

Attention: Patch coverage is 68.08511% with 45 lines in your changes missing coverage. Please review.

Project coverage is 67.47%. Comparing base (965253a) to head (cc3c46e).
Report is 3 commits behind head on main.

Files with missing lines Patch % Lines
go/vt/vtctl/workflow/server.go 75.51% 24 Missing ⚠️
...vtctldclient/command/vreplication/common/cancel.go 0.00% 7 Missing ⚠️
...ctldclient/command/vreplication/common/complete.go 0.00% 7 Missing ⚠️
...ctldclient/command/vreplication/workflow/delete.go 0.00% 7 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main   #17729      +/-   ##
==========================================
- Coverage   67.47%   67.47%   -0.01%     
==========================================
  Files        1594     1594              
  Lines      258978   259049      +71     
==========================================
+ Hits       174746   174785      +39     
- Misses      84232    84264      +32     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@mattlord mattlord removed NeedsIssue A linked issue is missing for this Pull Request NeedsBackportReason If backport labels have been applied to a PR, a justification is required NeedsDescriptionUpdate The description is not clear or comprehensive enough, and needs work labels Feb 10, 2025
Signed-off-by: Matt Lord <mattalord@gmail.com>
Signed-off-by: Matt Lord <mattalord@gmail.com>
Signed-off-by: Matt Lord <mattalord@gmail.com>
Signed-off-by: Matt Lord <mattalord@gmail.com>
@mattlord mattlord force-pushed the movetables_complete_wo_source_ks branch from 68a4c75 to 6440a91 Compare February 12, 2025 17:45
@mattlord mattlord changed the title VReplication: Support ignoring the source Keyspace on MoveTables complete VReplication: Support ignoring the source Keyspace on MoveTables complete/cancel Feb 12, 2025
@mattlord mattlord changed the title VReplication: Support ignoring the source Keyspace on MoveTables complete/cancel VReplication: Support ignoring the source Keyspace on MoveTables cancel/complete Feb 12, 2025
Signed-off-by: Matt Lord <mattalord@gmail.com>
@mattlord mattlord force-pushed the movetables_complete_wo_source_ks branch 4 times, most recently from f2855a4 to 667e62b Compare February 12, 2025 21:45
Signed-off-by: Matt Lord <mattalord@gmail.com>
@mattlord mattlord removed the NeedsWebsiteDocsUpdate What it says label Feb 12, 2025
mattlord added a commit to vitessio/website that referenced this pull request Feb 12, 2025
Signed-off-by: Matt Lord <mattalord@gmail.com>
@mattlord mattlord marked this pull request as ready for review February 12, 2025 22:40
Signed-off-by: Matt Lord <mattalord@gmail.com>
@mattlord mattlord force-pushed the movetables_complete_wo_source_ks branch from a0cb377 to 14b0032 Compare February 12, 2025 22:45
Signed-off-by: Matt Lord <mattalord@gmail.com>
Signed-off-by: Matt Lord <mattalord@gmail.com>
Signed-off-by: Matt Lord <mattalord@gmail.com>
And add comment

Signed-off-by: Matt Lord <mattalord@gmail.com>
Comment on lines 819 to 820
wg := sync.WaitGroup{}
errs := concurrency.AllErrorRecorder{}
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like a good candidate for errgroup, but fine as it is.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure, I can switch that over. I had only moved this code in the PR which is why I left it as-is.

Copy link
Contributor

Choose a reason for hiding this comment

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

Then leave it as it is.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I went ahead and migrated it since I was going to merge in origin/main anyway and thus do another CI run: 7946667

return err
func (s *Server) dropRelatedArtifacts(ctx context.Context, keepRoutingRules bool, sw iswitcher, opts ...WorkflowActionOption) error {
wopts := processWorkflowActionOptions(opts)
if !wopts.ignoreSourceKeyspace {
Copy link
Contributor

Choose a reason for hiding this comment

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

The suggested approach is "don't bother checking the source". I wonder if the approach should be "try the source if possible but fail gracefully"? Just a thought, not sure if that's desired.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I thought about that too but opted for this approach in the end so that we don't end up with undefined behavior and unknown state on the source — that is, some things are cleaned up on some shards (whatever was available and did not error at the time).

Copy link
Contributor

Choose a reason for hiding this comment

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

That's a good point.

Signed-off-by: Matt Lord <mattalord@gmail.com>
…o_source_ks

Signed-off-by: Matt Lord <mattalord@gmail.com>
@mattlord mattlord merged commit 96f4535 into vitessio:main Feb 25, 2025
106 checks passed
@mattlord mattlord deleted the movetables_complete_wo_source_ks branch February 25, 2025 23:07
mattlord added a commit to vitessio/website that referenced this pull request Feb 25, 2025
Signed-off-by: Matt Lord <mattalord@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: VReplication Type: Enhancement Logical improvement (somewhere between a bug and feature)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Feature Request: Add --force flag for MoveTables / Workflow completion
3 participants