Skip to content

[release-21.0] BuiltinBackupEngine: Retry file close and fail backup when we cannot (#18848)#18860

Closed
vitess-bot[bot] wants to merge 1 commit intorelease-21.0from
backport-18848-to-release-21.0
Closed

[release-21.0] BuiltinBackupEngine: Retry file close and fail backup when we cannot (#18848)#18860
vitess-bot[bot] wants to merge 1 commit intorelease-21.0from
backport-18848-to-release-21.0

Conversation

@vitess-bot
Copy link
Contributor

@vitess-bot vitess-bot bot commented Nov 3, 2025

Description

This is a backport of #18848

@vitess-bot
Copy link
Contributor Author

vitess-bot bot commented Nov 3, 2025

Hello @mattlord, 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 18860 -R vitessio/vitess
git reset --hard origin/release-21.0
git cherry-pick -m 1 1fe6c6809479fa9e0ab740a788f0e19d1ec60914

@vitess-bot vitess-bot bot added Backport This is a backport Component: Backup and Restore Skip CI Skip CI actions from running Merge Conflict labels Nov 3, 2025
@vitess-bot
Copy link
Contributor Author

vitess-bot bot commented Nov 3, 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.

@github-actions github-actions bot added this to the v21.0.6 milestone Nov 3, 2025
@mattlord
Copy link
Member

mattlord commented Nov 4, 2025

The builtin backup engine is significantly different in v21, so I'm going to close this as it's EOL soon and I don't want to risk destabilizing it for something that should be exceedingly rare.

I also checked to see if it had the general error handling issue fixed in the parent PR, but it does not have those issues. Those were introduced in later work.

@mattlord mattlord closed this Nov 4, 2025
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.

1 participant