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: Compatible with tiflash #34776

Merged
merged 8 commits into from May 18, 2022
Merged

pitr: Compatible with tiflash #34776

merged 8 commits into from May 18, 2022

Conversation

joccau
Copy link
Member

@joccau joccau commented May 18, 2022 •
edited

Signed-off-by: joccau zak.zhao@pingcap.com

What problem does this PR solve?

Issue Number: close #34777

Problem Summary:

What is changed and how it works?

  • update global schema version( inc 128) after restore log, thus the tiflash will skip the schemaDiff.
  • Support Tiflash replica on br restore full, bug do not support Tiflash replica on pitr.
  • Remove scheduler when restore, and recover scheduler at the end.

Check List

Tests

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

Manual test

  1. The tiflash replica is restored to down-stream if use br restore full.(restore full)
  2. The tiflash replica isn't restored to down-stream if use br restore point. ( PiTR)

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

@joccau
inc schemaversion for 128
ef72486 
Signed-off-by: joccau <zak.zhao@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 18, 2022 •
edited

[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 do-not-merge/needs-linked-issue release-note-none size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 18, 2022
@joccau
Copy link
Member Author

joccau commented May 18, 2022

/cc @YuJuncen @3pointer PTAL

@ti-chi-bot ti-chi-bot requested a review from 3pointer May 18, 2022 07:32
@ti-chi-bot
Copy link
Member

@joccau: GitHub didn't allow me to request PR reviews from the following users: PTAL.

Note that only pingcap members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc @YuJuncen @3pointer PTAL

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.

@ti-chi-bot ti-chi-bot requested a review from YuJuncen May 18, 2022 07:32
@sre-bot
Copy link
Contributor

sre-bot commented May 18, 2022 •
edited

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/b18b3503bb97147b798a0fd253b1794140ba6746

@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 May 18, 2022
@joccau
do not replica tiflash when pitr
caed6a4 
Signed-off-by: joccau <zak.zhao@pingcap.com>
@joccau
maintain test case
74b6922 
Signed-off-by: joccau <zak.zhao@pingcap.com>
3pointer
3pointer reviewed May 18, 2022
View reviewed changes
Copy link
Contributor

@3pointer 3pointer left a comment

Choose a reason for hiding this comment

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

rest LGTM

br/pkg/task/restore.go Outdated Show resolved Hide resolved
@joccau joccau requested a review from 3pointer May 18, 2022 09:14
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 18, 2022
@joccau
no need to add json
168195a 
Signed-off-by: joccau <zak.zhao@pingcap.com>
@joccau
Copy link
Member Author

joccau commented May 18, 2022

/component br

@joccau
Copy link
Member Author

joccau commented May 18, 2022

/run-integration-br-test

@ti-chi-bot ti-chi-bot added the component/br This issue is related to BR of TiDB. label May 18, 2022
3pointer
3pointer reviewed May 18, 2022
View reviewed changes
br/pkg/task/stream.go Outdated Show resolved Hide resolved
3pointer
3pointer approved these changes May 18, 2022
View reviewed changes
Copy link
Contributor

@3pointer 3pointer left a comment

Choose a reason for hiding this comment

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

rest LGTM

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 18, 2022
@joccau
Copy link
Member Author

joccau commented May 18, 2022

/run-integration-br-test

@joccau
Copy link
Member Author

joccau commented May 18, 2022

/run-all-tests

@joccau
Copy link
Member Author

joccau commented May 18, 2022

/cc @fengou1

@ti-chi-bot ti-chi-bot requested a review from fengou1 May 18, 2022 11:48
@joccau
Copy link
Member Author

joccau commented May 18, 2022

/run-all-tests

@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 May 18, 2022
@joccau
Copy link
Member Author

joccau commented May 18, 2022

/run-all-tests

@joccau
add comments
b18b350 
Signed-off-by: joccau <zak.zhao@pingcap.com>
@joccau
Copy link
Member Author

joccau commented May 18, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: b18b350

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 18, 2022
@joccau
Copy link
Member Author

joccau commented May 18, 2022

/run-mysql-test

@ti-chi-bot ti-chi-bot merged commit 76cc528 into pingcap:master May 18, 2022
@sre-bot
Copy link
Contributor

sre-bot commented May 18, 2022

TiDB MergeCI notify

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

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/integration-ddl-test ✅ all 6 tests passed 7 min 42 sec Fixed
idc-jenkins-ci-tidb/integration-compatibility-test ✅ all 1 tests passed 3 min 49 sec Fixed
idc-jenkins-ci/integration-cdc-test 🟢 all 34 tests passed 24 min Existing passed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 11 tests passed 17 min Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 11 min Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 8 min 29 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 7 min 12 sec Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 5 min 52 sec Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 12 tests passed 5 min 15 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

@joccau joccau mentioned this pull request May 23, 2022
Closed
@joccau joccau deleted the br-stream-tiflash branch May 23, 2022 14:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@3pointer 3pointer 3pointer approved these changes

@fengou1 fengou1 fengou1 approved these changes

@YuJuncen YuJuncen Awaiting requested review from YuJuncen

Assignees
No one assigned
Labels
component/br This issue is related to BR of TiDB. release-note-none 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

pitr: Compatible with tiflash
5 participants
@joccau @ti-chi-bot @sre-bot @3pointer @fengou1