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

pitr: prevent from restore point to cluster running log backup (#40871) #41215

Merged
merged 6 commits into from
Feb 13, 2023
Merged

pitr: prevent from restore point to cluster running log backup (#40871) #41215

merged 6 commits into from
Feb 13, 2023

Conversation

ti-chi-bot
Copy link
Member

@ti-chi-bot ti-chi-bot commented Feb 9, 2023 •
edited by Leavrth
Loading

This is an automated cherry-pick of #40871

Signed-off-by: Leavrth jianjun.liao@outlook.com

What problem does this PR solve?

Issue Number: ref #40797

Problem Summary:
If restore point to the cluster running log backup task, the backup files will be contaminated.

What is changed and how it works?

Before run resotre point, check whether there is a log backup task running in the cluster.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

Leavrth and others added 6 commits February 9, 2023 03:40
@Leavrth @ti-chi-bot
prevent from restore point to cluster running log backup
ea943b8 
Signed-off-by: Leavrth <jianjun.liao@outlook.com>
@Leavrth @ti-chi-bot
close the etcd client in time
b81bd68 
Signed-off-by: Leavrth <jianjun.liao@outlook.com>
@Leavrth @ti-chi-bot
resolve call cycle
75374c5 
Signed-off-by: Leavrth <jianjun.liao@outlook.com>
@Leavrth @joccau @ti-chi-bot
Update br/pkg/task/stream.go
faec281 
Co-authored-by: Zak Zhao <57036248+joccau@users.noreply.github.com>
@Leavrth @ti-chi-bot
add more info in error
406522a 
Signed-off-by: Leavrth <jianjun.liao@outlook.com>
@Leavrth @ti-chi-bot
add integration test
7b38f78 
Signed-off-by: Leavrth <jianjun.liao@outlook.com>
@ti-chi-bot ti-chi-bot mentioned this pull request Feb 9, 2023
Merged
12 tasks
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Feb 9, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 3pointer
  • joccau

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/cherry-pick-not-approved size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. labels Feb 9, 2023
@wuhuizuo
Copy link
Contributor

/hold high priority for trunk branch

@ti-chi-bot ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 10, 2023
@ti-chi-bot
Copy link
Member Author

/unhold

@ti-chi-bot ti-chi-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 10, 2023
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Feb 13, 2023
joccau
joccau approved these changes Feb 13, 2023
View reviewed changes
Copy link
Member

@joccau joccau left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Feb 13, 2023
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Feb 13, 2023
@joccau
Copy link
Member

joccau commented Feb 13, 2023

/run-all-tests

@joccau
Copy link
Member

joccau commented Feb 13, 2023

/merge

@ti-chi-bot
Copy link
Member Author

This pull request has been accepted and is ready to merge.

Commit hash: 7b38f78

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 13, 2023
@joccau
Copy link
Member

joccau commented Feb 13, 2023

/run-all-tests

@joccau
Copy link
Member

joccau commented Feb 13, 2023

/test check_dev

@ti-chi-bot
Copy link
Member Author

@joccau: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test build
  • /test check-dev
  • /test check-dev2
  • /test mysql-test
  • /test unit-test

Use /test all to run all jobs.

In response to this:

/test check_dev

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@joccau
Copy link
Member

joccau commented Feb 13, 2023

/rebuild

1 similar comment
@joccau
Copy link
Member

joccau commented Feb 13, 2023

/rebuild

@joccau
Copy link
Member

joccau commented Feb 13, 2023

/retest

@ti-chi-bot ti-chi-bot merged commit 1491101 into pingcap:release-6.5 Feb 13, 2023
@VelocityLight VelocityLight added do-not-merge/cherry-pick-not-approved cherry-pick-approved Cherry pick PR approved by release team. and removed cherry-pick-approved Cherry pick PR approved by release team. do-not-merge/cherry-pick-not-approved labels Mar 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joccau joccau joccau approved these changes

@Leavrth Leavrth Leavrth approved these changes

@3pointer 3pointer 3pointer approved these changes

Assignees

@Leavrth Leavrth

Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@ti-chi-bot @wuhuizuo @joccau @3pointer @Leavrth @VelocityLight