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

[release-17.0] Do not drain tablet in incremental backup (#13773) #13789

Merged
merged 4 commits into from
Aug 16, 2023

Conversation

vitess-bot[bot]
Copy link
Contributor

@vitess-bot vitess-bot bot commented Aug 15, 2023

Description

This is a backport of #13773

@vitess-bot
Copy link
Contributor Author

vitess-bot bot commented Aug 15, 2023

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
Copy link
Contributor Author

vitess-bot bot commented Aug 15, 2023

Hello @shlomi-noach, there are conflicts in this backport.

Please address them in order to merge this Pull Request. You can execute the snippet below to reset your branch and resolve the conflict manually.

Make sure you replace origin by the name of the vitessio/vitess remote

git fetch --all
gh pr checkout 13789 -R vitessio/vitess
git reset --hard origin/release-17.0
git cherry-pick -m 1 16024c2b7c2ceac9009d8174cad198159b64580b

@vitess-bot vitess-bot bot added 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 Aug 15, 2023
Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
@shlomi-noach shlomi-noach removed NeedsDescriptionUpdate The description is not clear or comprehensive enough, and needs work NeedsWebsiteDocsUpdate What it says Skip CI Skip CI actions from running NeedsIssue A linked issue is missing for this Pull Request Merge Conflict labels Aug 15, 2023
@github-actions github-actions bot added this to the v17.0.2 milestone Aug 15, 2023
Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
@shlomi-noach shlomi-noach marked this pull request as ready for review August 15, 2023 14:04
@mattlord mattlord mentioned this pull request Aug 15, 2023
19 tasks
@shlomi-noach shlomi-noach requested a review from a team August 15, 2023 14:14
Copy link
Contributor

@mattlord mattlord left a comment

Choose a reason for hiding this comment

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

Why is this different in the v17 backport (new 2 file)? Aside from that, everything looks good. I just don't know why we now have builtinbackupengine2_test.go and builtinbackupengine_test.go in the backport.

@shlomi-noach
Copy link
Contributor

Why is this different in the v17 backport (new 2 file)?

It's because of this: #13668 (comment) ; we refactored the test file names in main, but never backported it to release-17.0. The file go/vt/mysqlctl/builtinbackupengine_test.go is not your conventional unit test file and should not have been named the way it was: it uses a different package name than mysqlctl, which is the package that matches the directory where the file is located.

So, anyway, to add this new unit test, I had to create a new file in release-17.0.

@mattlord mattlord merged commit 59f39c6 into release-17.0 Aug 16, 2023
220 of 221 checks passed
@mattlord mattlord deleted the backport-13773-to-release-17.0 branch August 16, 2023 12:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants