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

*: Add test to cover the case that resolving prewrite lock from a stale pessimistic lock written before switching primary #42990

Merged
merged 8 commits into from
May 23, 2023
Merged

*: Add test to cover the case that resolving prewrite lock from a stale pessimistic lock written before switching primary #42990

merged 8 commits into from
May 23, 2023

Conversation

MyonKeminta
Copy link
Contributor

@MyonKeminta MyonKeminta commented Apr 12, 2023 •
edited
Loading

What problem does this PR solve?

Issue Number: close #42937

Problem Summary:

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.

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Apr 12, 2023 •
edited by ti-chi-bot bot
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • cfzjywxk
  • ekexium

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
Copy link
Member

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@ti-chi-bot ti-chi-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none do-not-merge/needs-triage-completed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 12, 2023
@MyonKeminta
Copy link
Contributor Author

/test all

@MyonKeminta
Copy link
Contributor Author

/test all

@ti-chi-bot
Copy link

ti-chi-bot bot commented May 15, 2023

@MyonKeminta: The /test command needs one or more targets.
The following commands are available to trigger required jobs:

  • /test build
  • /test canary-scan-security
  • /test check-dev
  • /test check-dev2
  • /test mysql-test
  • /test unit-test

Use /test all to run the following jobs that were automatically triggered:

  • pingcap/tidb/ghpr_build
  • pingcap/tidb/ghpr_check
  • pingcap/tidb/ghpr_check2
  • pingcap/tidb/ghpr_mysql_test
  • pingcap/tidb/ghpr_unit_test

In response to this:

/test

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.

@MyonKeminta
Copy link
Contributor Author

/test all

@ti-chi-bot ti-chi-bot bot deleted a comment from ti-chi-bot May 15, 2023
@MyonKeminta
Copy link
Contributor Author

/test all

@MyonKeminta
Merge branch 'master' of https://github.com/pingcap/tidb into m/prima…
f5ac86f 
…ry-change-consistency-issue
@MyonKeminta
update the test
f2bb0cf 
Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
@MyonKeminta MyonKeminta marked this pull request as ready for review May 16, 2023 10:30
@ti-chi-bot ti-chi-bot bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 16, 2023
@MyonKeminta
remove unnecessary debug code
91f8ac7 
Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 17, 2023
@ti-chi-bot ti-chi-bot bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 18, 2023
@ti-chi-bot ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels May 19, 2023
@cfzjywxk
Copy link
Contributor

@MyonKeminta Need to resolve conflicts.

@ti-chi-bot ti-chi-bot bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 23, 2023
@MyonKeminta
Copy link
Contributor Author

/retest

@MyonKeminta
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link

ti-chi-bot bot commented May 23, 2023

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

Commit hash: 93b6c20

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label May 23, 2023
@ti-chi-bot ti-chi-bot bot merged commit 909ff3c into pingcap:master May 23, 2023
8 checks passed
@ti-chi-bot ti-chi-bot mentioned this pull request May 23, 2023
Merged
12 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.5: #44118.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request May 23, 2023
@MyonKeminta @ti-chi-bot
This is an automated cherry-pick of pingcap#42990
df4e9d6 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.1: #44119.

@ti-chi-bot ti-chi-bot mentioned this pull request May 23, 2023
Merged
12 tasks
ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request May 23, 2023
@MyonKeminta @ti-chi-bot
*: Add test to cover the case that resolving prewrite lock from a sta…
9d17ac2 
…le pessimistic lock written before switching primary (pingcap#42990)

close pingcap#42937
@MyonKeminta MyonKeminta deleted the m/primary-change-consistency-issue branch May 23, 2023 12:16
ti-chi-bot bot pushed a commit that referenced this pull request May 24, 2023
@ti-chi-bot
*: Add test to cover the case that resolving prewrite lock from a sta…
7446665 
…le pessimistic lock written before switching primary (#42990) (#44119)

close #42937
ti-chi-bot bot pushed a commit that referenced this pull request May 29, 2023
@ti-chi-bot
*: Add test to cover the case that resolving prewrite lock from a sta…
17d97bd 
…le pessimistic lock written before switching primary (#42990) (#44118)

close #42937
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cfzjywxk cfzjywxk cfzjywxk approved these changes

@ekexium ekexium ekexium approved these changes

@zyguan zyguan Awaiting requested review from zyguan

Assignees
No one assigned
Labels
needs-cherry-pick-release-6.5 needs-cherry-pick-release-7.1 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.

ResolveLocks for pessimistic transaction that has switched primary may break transaction atomicity
4 participants
@MyonKeminta @ti-chi-bot @cfzjywxk @ekexium