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

ddl: use the correct schema version when waitSchemaSynced #37210

Merged
merged 8 commits into from
Aug 19, 2022
Merged

ddl: use the correct schema version when waitSchemaSynced #37210

merged 8 commits into from
Aug 19, 2022

Conversation

wjhuang2016
Copy link
Member

@wjhuang2016 wjhuang2016 commented Aug 18, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: close #37209

Problem Summary:
tidb doesn't check the newest schema version if crushed before updating the global version.

What is changed and how it works?

Use GetSchemaVersionWithNonEmptyDiff instead of mustGetGlobalVersion to get the newest schema version.

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

@wjhuang2016
save
7922265 
Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
@wjhuang2016
Merge branch 'master' of https://github.com/pingcap/tidb
a7b6678
@wjhuang2016
done
b0196b6 
Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 18, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • lcwangchao
  • zimulala

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/needs-triage-completed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 18, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Aug 18, 2022 •
edited
Loading

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

zimulala
zimulala reviewed Aug 19, 2022
View reviewed changes
ddl/db_test.go
tk.MustExec("create table t(a int)")

require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/ddl/mockDownBeforeUpdateGlobalVersion", `return(true)`))
require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/ddl/checkDownBeforeUpdateGlobalVersion", `return(true)`))
Copy link
Contributor

Choose a reason for hiding this comment

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

Please do Disable after using.

@wjhuang2016
done
6ab6c67 
Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
zimulala
zimulala approved these changes Aug 19, 2022
View reviewed changes
Copy link
Contributor

@zimulala zimulala 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 Aug 19, 2022
@wjhuang2016
fix
13e4411 
Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
@wjhuang2016
refine
0872178 
Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
@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 Aug 19, 2022
@lcwangchao
Copy link
Collaborator

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 0872178

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

/merge

@ti-chi-bot ti-chi-bot merged commit 41b9e26 into pingcap:master Aug 19, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Aug 19, 2022

TiDB MergeCI notify

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci/integration-cdc-test 🟢 all 36 tests passed 41 min Existing passed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 17 tests passed 15 min Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 11 tests passed 13 min Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 9 min 25 sec Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 7 min 49 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 7 min 12 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 6 min 8 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 3 min 41 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 3 min 18 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

@wjhuang2016 wjhuang2016 deleted the fix_down_before_update_global_version branch November 17, 2022 11:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lcwangchao lcwangchao lcwangchao approved these changes

@zimulala zimulala zimulala approved these changes

Assignees
No one assigned
Labels
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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

tidb doesn't check the newest schema version if crushed before updating the global version
5 participants
@wjhuang2016 @ti-chi-bot @sre-bot @lcwangchao @zimulala