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

Jump to bottom

MoveTables: remove option to specify source keyspace alias for multi-tenant migrations #15712

Merged
merged 8 commits into from
Apr 16, 2024
Merged

MoveTables: remove option to specify source keyspace alias for multi-tenant migrations #15712

merged 8 commits into from
Apr 16, 2024

Conversation

rohit-nayak-ps
Copy link
Contributor

@rohit-nayak-ps rohit-nayak-ps commented Apr 15, 2024 •
edited
Loading

Description

In #15503 we had added a functionality to add an alias to the source keyspace. However on further investigation this is not really needed and hence it is being removed.

The feature was declared experimental and introduced in v20, so there are no backward compatibility issues.

Related Issue(s)

#15403
#15503

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 or is not required

Deployment Notes

@rohit-nayak-ps
Remove alias option from workflow options proto
07b682e 
Signed-off-by: Rohit Nayak <rohit@planetscale.com>
@rohit-nayak-ps
Remove comment for alias in _vt.vreplication schema
ddc9643 
Signed-off-by: Rohit Nayak <rohit@planetscale.com>
@rohit-nayak-ps
Remove references to source keyspace alias in e2e test
dfba3db 
Signed-off-by: Rohit Nayak <rohit@planetscale.com>
@rohit-nayak-ps
Improve comment as IDE suggests ...
32d7544 
Signed-off-by: Rohit Nayak <rohit@planetscale.com>
@rohit-nayak-ps
Remove references to SourceKeyspaceAlias
ac7b647 
Signed-off-by: Rohit Nayak <rohit@planetscale.com>
@rohit-nayak-ps
Remove references to aliased keyspace from e2e test
fc1ec9c 
Signed-off-by: Rohit Nayak <rohit@planetscale.com>
@vitess-bot vitess-bot
Copy link
Contributor

vitess-bot bot commented Apr 15, 2024

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 Apr 15, 2024
@github-actions github-actions bot added this to the v20.0.0 milestone Apr 15, 2024
@rohit-nayak-ps rohit-nayak-ps added Type: Internal Cleanup Component: VReplication and removed NeedsDescriptionUpdate The description is not clear or comprehensive enough, and needs work NeedsWebsiteDocsUpdate What it says NeedsIssue A linked issue is missing for this Pull Request NeedsBackportReason If backport labels have been applied to a PR, a justification is required labels Apr 15, 2024
@codecov Codecov
Copy link

codecov bot commented Apr 15, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.39%. Comparing base (f118ba2) to head (eedb5d1).
Report is 8 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main   #15712      +/-   ##
==========================================
- Coverage   68.40%   68.39%   -0.02%     
==========================================
  Files        1556     1556              
  Lines      195121   195347     +226     
==========================================
+ Hits       133479   133610     +131     
- Misses      61642    61737      +95

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

@rohit-nayak-ps
Mark removed proto attribute reserved instead of deleting that line ...
65bb68d 
Signed-off-by: Rohit Nayak <rohit@planetscale.com>
rohit-nayak-ps
rohit-nayak-ps commented Apr 15, 2024
View reviewed changes
proto/vtctldata.proto Outdated
@@ -208,7 +208,8 @@ message Shard {

message WorkflowOptions {
string tenant_id = 1;
string source_keyspace_alias = 2;
// Previously used for source_keyspace_alias which was removed before being formally released.
reserved 2;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do we need to mark this reserved or can we just delete it and move strip_sharded_auto_increment to 2 since that PR is also recent and we haven't got a release or a production cluster with this proto in use.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think we can change the proto since neither of those fields were in a release.

Copy link
Member

@deepthi deepthi Apr 16, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

agree with mattlord. we can rearrange the fields. Please go ahead and make that change, and then merge.

@rohit-nayak-ps rohit-nayak-ps marked this pull request as ready for review April 15, 2024 19:47
notfelineit
notfelineit approved these changes Apr 15, 2024
View reviewed changes
Copy link
Contributor

@notfelineit notfelineit left a comment

Choose a reason for hiding this comment

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

I can't answer the question about reserved but the rest looks good to me!

mattlord
mattlord approved these changes Apr 16, 2024
View reviewed changes
proto/vtctldata.proto Outdated
@@ -208,7 +208,8 @@ message Shard {

message WorkflowOptions {
string tenant_id = 1;
string source_keyspace_alias = 2;
// Previously used for source_keyspace_alias which was removed before being formally released.
reserved 2;
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we can change the proto since neither of those fields were in a release.

@deepthi
Copy link
Member

deepthi commented Apr 16, 2024

I've applied the Do Not Merge label so that no one merges this PR by mistake until @rohit-nayak-ps has a chance to make the protobuf changes discussed in reviews.

@rohit-nayak-ps
Rearrange the proto for workflow options after removal of source keys…
eedb5d1 
…pace alias and reuse the slot since we haven't released either of the features used by the current set of options and these are all within the v20 dev cycle.

Signed-off-by: Rohit Nayak <rohit@planetscale.com>
@rohit-nayak-ps
Copy link
Contributor Author

rohit-nayak-ps commented Apr 16, 2024 •
edited by deepthi
Loading

I've applied the Do Not Merge label so that no one merges this PR by mistake until @rohit-nayak-ps has a chance to make the protobuf changes discussed in reviews.

Made the change to the protobuf spec. Merging now.

@rohit-nayak-ps rohit-nayak-ps merged commit 4519c8f into vitessio:main Apr 16, 2024
104 of 105 checks passed
@rohit-nayak-ps rohit-nayak-ps deleted the rohit/remove-multi-tenant-source-keyspace-alias branch April 16, 2024 06:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deepthi deepthi deepthi approved these changes

@mattlord mattlord mattlord approved these changes

@notfelineit notfelineit notfelineit approved these changes

@harshit-gangal harshit-gangal Awaiting requested review from harshit-gangal harshit-gangal is a code owner

@ajm188 ajm188 Awaiting requested review from ajm188 ajm188 is a code owner

Assignees
No one assigned
Labels
Component: VReplication Type: Internal Cleanup
Projects
None yet
Milestone
v20.0.0
Development

Successfully merging this pull request may close these issues.
4 participants
@rohit-nayak-ps @deepthi @mattlord @notfelineit