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

*: improve flashback to timestamp, let it compatible with TiCDC #39442

Merged
merged 9 commits into from
Nov 29, 2022
Merged

*: improve flashback to timestamp, let it compatible with TiCDC #39442

merged 9 commits into from
Nov 29, 2022

Conversation

Defined2014
Copy link
Contributor

@Defined2014 Defined2014 commented Nov 29, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: ref tikv/tikv#13823

Problem Summary:

  1. add a warning msg when time gap between tidb node and pd tso is larger than 1 second.
  2. update kvproto, add startTS and flashbackTS in prepare phase, let it compatible with TiCDC.
  3. avoid change unnecessary pd schedule params.

What is changed and how it works?

Check List

Tests

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

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 29, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • JmPotato
  • 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/invalid-title release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 29, 2022
@Defined2014 Defined2014 changed the title Flashback start ts *: improve flashback to timestamp, let it compatible with TiCDC Nov 29, 2022
@fengou1 fengou1 self-requested a review November 29, 2022 04:50
fengou1
fengou1 approved these changes Nov 29, 2022
View reviewed changes
Copy link
Contributor

@fengou1 fengou1 left a comment

Choose a reason for hiding this comment

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

for backup restore:
flashback version = resolvedTs
startTs = restoreTs - 1
commitTs = restoreTs

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 29, 2022
JmPotato
JmPotato reviewed Nov 29, 2022
View reviewed changes
br/pkg/restore/data.go
@@ -57,7 +57,7 @@ func RecoverData(ctx context.Context, resolveTS uint64, allStores []*metapb.Stor
return totalRegions, errors.Trace(err)
}

if err := recovery.PrepareFlashbackToVersion(ctx); err != nil {
if err := recovery.PrepareFlashbackToVersion(ctx, resolveTS, restoreTS-1); err != nil {
Copy link
Member

Choose a reason for hiding this comment

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

Can we guarantee that no other write on restoreTS-1? Otherwise, it may overwrite the old value.

/cc @fengou1

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, In EBS restore. workflow as follows

  1. start pd
  2. set pd/tikv recoverymode
  3. start tikv
  4. prepare/flashback version
  5. start tidb

there is no chance to write any data before step 5 (start tidb)

@ti-chi-bot ti-chi-bot requested a review from fengou1 November 29, 2022 05:31
@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 29, 2022
@Defined2014
Copy link
Contributor Author

/hold

@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 Nov 29, 2022
@Defined2014
Copy link
Contributor Author

merge it after tikv/tikv#13823 merged

@Defined2014
Copy link
Contributor 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 Nov 29, 2022
@Defined2014
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 8ee78c6

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 29, 2022
@ti-chi-bot ti-chi-bot merged commit 1cebd1d into pingcap:master Nov 29, 2022
@Defined2014 Defined2014 deleted the flashback-startTs branch November 29, 2022 15:09
@sre-bot
Copy link
Contributor

sre-bot commented Nov 29, 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/sqllogic-test-2 ✅ all 28 tests passed 5 min 42 sec Fixed
idc-jenkins-ci/integration-cdc-test 🟢 all 40 tests passed 22 min Existing passed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 17 tests passed 16 min Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 11 tests passed 14 min Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 6 min 36 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 6 min 11 sec Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 5 min 32 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 5 min 12 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 2 min 33 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
Reviewers

@JmPotato JmPotato JmPotato approved these changes

@fengou1 fengou1 Awaiting requested review from fengou1

Assignees
No one assigned
Labels
release-note-none Denotes a PR that doesn't merit a release note. 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.
5 participants
@Defined2014 @ti-chi-bot @sre-bot @JmPotato @fengou1