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

Manual cherry-pick of 13339 #13733

Merged
merged 3 commits into from
Aug 10, 2023
Merged

Manual cherry-pick of 13339 #13733

merged 3 commits into from
Aug 10, 2023

Conversation

rohit-nayak-ps
Copy link
Contributor

@rohit-nayak-ps rohit-nayak-ps commented Aug 7, 2023 •
edited by deepthi
Loading

Description

Manually recreated the changes from #13339 to 16.0, rather than doing a complex merge.

FIXME: the changes are currently not tested, because I am not sure where should we invoke verifyRestorePositionAndTimeStats(). The test case in main where I was doing this is not present in release-16.0

Related Issue(s)

#13339

Checklist

  • "Backport to:" labels have been added if this change should be back-ported
  • Tests were added or are not required
  • Did the new or modified tests pass consistently locally and on the CI
  • Documentation was added or is not required

Deployment Notes

@rohit-nayak-ps
Manual cherry-pick of 13339
a21f44b 
Signed-off-by: Rohit Nayak <rohit@planetscale.com>
@github-actions github-actions bot added this to the v16.0.4 milestone Aug 7, 2023
@rohit-nayak-ps
Remove incorrect call to verifyRestorePositionAndTimeStats
3dbf355 
Signed-off-by: Rohit Nayak <rohit@planetscale.com>
@rohit-nayak-ps
Fix typo in RestoredBackupTime stat
e5b86f5 
Signed-off-by: Rohit Nayak <rohit@planetscale.com>
@rohit-nayak-ps rohit-nayak-ps marked this pull request as ready for review August 10, 2023 09:20
@rohit-nayak-ps rohit-nayak-ps requested review from dbussink, mattlord, frouioui and a team August 10, 2023 09:22
@deepthi deepthi merged commit 630728f into vitessio:release-16.0 Aug 10, 2023
@deepthi deepthi deleted the backport-13339 branch August 10, 2023 15:31
@shlomi-noach shlomi-noach mentioned this pull request Aug 13, 2023
Merged
@hmaurer hmaurer mentioned this pull request Mar 21, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shlomi-noach shlomi-noach shlomi-noach approved these changes

@deepthi deepthi deepthi approved these changes

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

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

@dbussink dbussink Awaiting requested review from dbussink

@mattlord mattlord Awaiting requested review from mattlord

@frouioui frouioui Awaiting requested review from frouioui

Assignees

@rohit-nayak-ps rohit-nayak-ps

Labels
Backport This is a backport Component: Backup and Restore Type: Bug
Projects
None yet
Milestone
v16.0.4
Development

Successfully merging this pull request may close these issues.
3 participants
@rohit-nayak-ps @deepthi @shlomi-noach