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

Filter lock flag 'F' (#7569) #7573

Merged
merged 3 commits into from
Jun 9, 2023
Merged

Filter lock flag 'F' (#7569) #7573

merged 3 commits into from
Jun 9, 2023

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #7569

What problem does this PR solve?

Issue Number: close #7563

Problem Summary:

Due to pingcap/tidb#43540, tikv propose a fix that introduce a new flag F that shall be filtered by TiFlash.

The new flag is to persist a special state that guides tikv how to resolve locks.

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

None

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented May 30, 2023

[REVIEW NOTIFICATION]

This pull request has not been approved.

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 bot added do-not-merge/cherry-pick-not-approved release-note-none Denotes a PR that doesn't merit a release note. labels May 30, 2023
@ti-chi-bot ti-chi-bot added the release-note-none Denotes a PR that doesn't merit a release note. label May 30, 2023
@ti-chi-bot ti-chi-bot mentioned this pull request May 30, 2023
Merged
12 tasks
@ti-chi-bot ti-chi-bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR. labels May 30, 2023
@ti-chi-bot ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 30, 2023
JaySon-Huang
JaySon-Huang reviewed May 30, 2023
View reviewed changes
dbms/src/Storages/Transaction/TiKVRecordFormat.cpp
@@ -0,0 +1,176 @@
// Copyright 2023 PingCAP, Ltd.
Copy link
Contributor

Choose a reason for hiding this comment

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

this is a new file introduced by #7537. Should we also pick the changes into this PR to release-7.1?

Copy link
Member

@CalvinNeo CalvinNeo Jun 9, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Yes, we also need to remove the old lines.

@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Jun 1, 2023
@CalvinNeo
f
7bf0437 
Signed-off-by: CalvinNeo <[email protected]>
@ti-chi-bot ti-chi-bot bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 9, 2023
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Jun 9, 2023
@CalvinNeo CalvinNeo requested a review from JaySon-Huang June 9, 2023 09:25
@CalvinNeo
Copy link
Member

/run-all-tests

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jun 9, 2023

@ti-chi-bot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

trigger some heavy tests which will not run always when PR updated.

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

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 ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jun 9, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CalvinNeo, JaySon-Huang

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [CalvinNeo,JaySon-Huang]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Jun 9, 2023
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jun 9, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-06-09 09:25:08.059399546 +0000 UTC m=+76722.307321371: ☑️ agreed by CalvinNeo.
  • 2023-06-09 09:51:14.634807309 +0000 UTC m=+78288.882729134: ☑️ agreed by JaySon-Huang.

@JaySon-Huang
Copy link
Contributor

/run-all-tests

@CalvinNeo
Copy link
Member

/run-integration-test

@ti-chi-bot ti-chi-bot bot merged commit 7b5cfbc into pingcap:release-7.1 Jun 9, 2023
@ti-chi-bot ti-chi-bot removed the cherry-pick-approved Cherry pick PR approved by release team. label Jul 24, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Jul 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CalvinNeo CalvinNeo CalvinNeo approved these changes

@JaySon-Huang JaySon-Huang JaySon-Huang approved these changes

Assignees

@CalvinNeo CalvinNeo

Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ti-chi-bot @CalvinNeo @JaySon-Huang @VelocityLight