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

br: replace GetTS with GetTSWithRetry #38948

Merged
merged 2 commits into from
Nov 22, 2022

Conversation

MoCuishle28
Copy link
Contributor

@MoCuishle28 MoCuishle28 commented Nov 7, 2022

Signed-off-by: zhanggaoming gaoming.zhang@pingcap.com

What problem does this PR solve?

Issue Number: ref #36910

Problem Summary:
When the switch of the leader occurs in the PD, it affect the BR restore and PiTR restore.

What is changed and how it works?

replace GetTS with GetTSWithRetry

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

Manual test

  • run restore with injected error
  • restore succeeded

Release note

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

Fix a bug that caused: When the switch of the leader occurs in the PD, it affect the BR restore and PiTR restore.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 7, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 3pointer
  • fengou1

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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 7, 2022
@MoCuishle28
Copy link
Contributor Author

/component br

@ti-chi-bot ti-chi-bot added the component/br This issue is related to BR of TiDB. label Nov 7, 2022
@MoCuishle28
Copy link
Contributor Author

/run-integration-br-test

1 similar comment
@MoCuishle28
Copy link
Contributor Author

/run-integration-br-test

@MoCuishle28
Copy link
Contributor Author

/run-integration-br-test

@MoCuishle28
Copy link
Contributor Author

/run-check-dev-2

@MoCuishle28
Copy link
Contributor Author

/run-mysql-test
/run-check-dev-2

@MoCuishle28
Copy link
Contributor Author

/run-integration-br-test

@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 14, 2022
@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 Nov 21, 2022
@fengou1
Copy link
Contributor

fengou1 commented Nov 21, 2022

it looks we can cherry-pick to other versions, 6.1, 6.2, 6.3, 6.4

@3pointer
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: bf241ff733e15f7d53a9e06b44b323919b99742e

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 22, 2022
@MoCuishle28
Copy link
Contributor Author

/run-check-dev-2

Signed-off-by: zhanggaoming <gaoming.zhang@pingcap.com>
Signed-off-by: zhanggaoming <gaoming.zhang@pingcap.com>
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Nov 22, 2022
@3pointer
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 74d7142

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 22, 2022
@ti-chi-bot ti-chi-bot merged commit 74aa891 into pingcap:master Nov 22, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Nov 22, 2022

TiDB MergeCI notify

✅ Well Done! New fixed [1] after this pr merged.

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/mybatis-test 🔴 failed 1, success 0, total 1 11 min Existing failure
idc-jenkins-ci/integration-cdc-test ✅ all 39 tests passed 19 min Fixed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 17 tests passed 21 min Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 11 tests passed 10 min Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 7 min 31 sec Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 6 min 52 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 6 min 43 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 6 min 31 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 3 min 53 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
affects-6.1 affects-6.2 affects-6.3 affects-6.4 component/br This issue is related to BR of TiDB. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants