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

(6.5) lock_resolver: support verifying primary for check_txn_status (#777) #819

Merged
merged 6 commits into from
May 29, 2023

Conversation

MyonKeminta
Copy link
Contributor

Cherry-picks #777 to tidb-6.5 branch.

Ref: pingcap/tidb#42937

MyonKeminta and others added 2 commits May 26, 2023 18:31
Signed-off-by: MyonKeminta <[email protected]>
* support verifying primary for check_txn_status

Signed-off-by: MyonKeminta <[email protected]>

* update kvproto

Signed-off-by: MyonKeminta <[email protected]>

* add more failpoint usages

Signed-off-by: MyonKeminta <[email protected]>

* update depencency and fix test

Signed-off-by: MyonKeminta <[email protected]>

* Do not skip for unistore; refine logs

Signed-off-by: MyonKeminta <[email protected]>

* Address comments

Signed-off-by: MyonKeminta <[email protected]>

---------

Signed-off-by: MyonKeminta <[email protected]>
Co-authored-by: MyonKeminta <[email protected]>
@MyonKeminta
Copy link
Contributor Author

How can I run CI on this branch?

Signed-off-by: MyonKeminta <[email protected]>
@MyonKeminta MyonKeminta force-pushed the m/cherry-pick-primary-chagne-fix branch from 17396b4 to 7a6ed8d Compare May 29, 2023 07:51
Signed-off-by: MyonKeminta <[email protected]>
This reverts commit 7a6ed8d.

Signed-off-by: MyonKeminta <[email protected]>
Signed-off-by: MyonKeminta <[email protected]>
@MyonKeminta
Copy link
Contributor Author

Some test fails. Integration tests with tikv fails because there are no nightly build of tikv on release-6.5 branch on dockerhub. golangci fails due to some reason I don't know. But they are not requried by tidb-6.5 branch of this repo so it doesn't block merging.

@cfzjywxk PTAL.

@cfzjywxk
Copy link
Contributor

Ok we could merge it directly.

@cfzjywxk cfzjywxk merged commit 3abd693 into tikv:tidb-6.5 May 29, 2023
@MyonKeminta MyonKeminta deleted the m/cherry-pick-primary-chagne-fix branch May 29, 2023 08:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants