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

br: continue to retry when pitr met the error about memory is limited (#41982) #41995

Merged
merged 3 commits into from
Mar 7, 2023
Merged

br: continue to retry when pitr met the error about memory is limited (#41982) #41995

merged 3 commits into from
Mar 7, 2023

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #41982

What problem does this PR solve?

Issue Number: close #41983

Problem Summary:

  • If the config tikv.import.memory-use-ratio is too low, tikv-server would report the error "memory is limited" to BR when PITR restore, and the PITR restore failed finally because the retry times exceeds the threshold.

What is changed and how it works?

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.

Fix the issue that failed to restore log with the error "memory is limited".

@joccau @ti-chi-bot
continuing retry when pitr met the error about memory is limited
6980f1a 
Signed-off-by: joccau <zak.zhao@pingcap.com>
@joccau @ti-chi-bot
add unit test
87111cc 
Signed-off-by: joccau <zak.zhao@pingcap.com>
@joccau @ti-chi-bot
rename failpoint string
82ea58f 
Signed-off-by: joccau <zak.zhao@pingcap.com>
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Mar 7, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 3pointer
  • fengou1
  • 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 Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/cherry-pick-not-approved labels Mar 7, 2023
@ti-chi-bot ti-chi-bot mentioned this pull request Mar 7, 2023
Merged
12 tasks
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 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 Mar 7, 2023
joccau
joccau approved these changes Mar 7, 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 Mar 7, 2023
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Mar 7, 2023
@joccau
Copy link
Member

joccau commented Mar 7, 2023

/merge

@ti-chi-bot
Copy link
Member Author

@joccau: /merge in this pull request requires 2 approval(s).

In response to this:

/merge

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 ti-community-infra/tichi repository.

@joccau
Copy link
Member

joccau commented Mar 7, 2023

/merge

@ti-chi-bot
Copy link
Member Author

@joccau: /merge in this pull request requires 2 approval(s).

In response to this:

/merge

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 ti-community-infra/tichi repository.

joccau
joccau approved these changes Mar 7, 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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Mar 7, 2023
@joccau
Copy link
Member

joccau commented Mar 7, 2023

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: 82ea58f

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 7, 2023
@jebter
Copy link

jebter commented Mar 7, 2023

/test build

1 similar comment
@Ivy-YinSu
Copy link

/test build

@Ivy-YinSu
Copy link

/test build

1 similar comment
@3pointer
Copy link
Contributor

3pointer commented Mar 7, 2023

/test build

@joccau
Copy link
Member

joccau commented Mar 7, 2023

/rebuild

3 similar comments
@joccau
Copy link
Member

joccau commented Mar 7, 2023

/rebuild

@joccau
Copy link
Member

joccau commented Mar 7, 2023

/rebuild

@joccau
Copy link
Member

joccau commented Mar 7, 2023

/rebuild

@YuJuncen
Copy link
Contributor

YuJuncen commented Mar 7, 2023

/build

@YuJuncen
Copy link
Contributor

YuJuncen commented Mar 7, 2023

/run-unit-test

@YuJuncen
Copy link
Contributor

YuJuncen commented Mar 7, 2023

/test build

@YuJuncen
Copy link
Contributor

YuJuncen commented Mar 7, 2023

/test unit-test

1 similar comment
@wuhuizuo
Copy link
Contributor

wuhuizuo commented Mar 7, 2023

/test unit-test

@ti-chi-bot ti-chi-bot merged commit 4084b07 into pingcap:release-6.5 Mar 7, 2023
@joccau joccau changed the title br: continuing retry when pitr met the error about memory is limited (#41982) br: continue to retry when pitr met the error about memory is limited (#41982) Mar 8, 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
@ti-chi-bot ti-chi-bot added do-not-merge/cherry-pick-not-approved and removed cherry-pick-approved Cherry pick PR approved by release team. labels Mar 13, 2023
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Mar 13, 2023
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed 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

@fengou1 fengou1 fengou1 approved these changes

@joccau joccau joccau approved these changes

@3pointer 3pointer 3pointer approved these changes

Assignees

@joccau joccau

Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 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.
9 participants
@ti-chi-bot @joccau @jebter @Ivy-YinSu @3pointer @YuJuncen @wuhuizuo @fengou1 @VelocityLight