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

txn: Use TransactionOption in store/tikv module #23255

Merged
merged 20 commits into from
May 11, 2021
Merged

txn: Use TransactionOption in store/tikv module #23255

merged 20 commits into from
May 11, 2021

Conversation

longfangsong
Copy link
Contributor

@longfangsong longfangsong commented Mar 11, 2021 •
edited
Loading

What problem does this PR solve?

This is a step forward of #23130.

We introduced TransactionOption there, which can also be used in store/tikv module.

What is changed and how it works?

unify all the newTiKVTxnXXX into just newTiKVTxnWithOptions, and add a DefaultTransactionOption to make our life easier in tests.

Check List

Tests

  • Unit test

Release note

  • No release note

@ti-chi-bot ti-chi-bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Mar 11, 2021
@ti-srebot
Copy link
Contributor

No release note, Please follow https://github.com/pingcap/community/blob/master/contributors/release-note-checker.md

@sre-bot
Copy link
Contributor

sre-bot commented Mar 11, 2021

Please follow PR Title Format:

  • pkg [, pkg2, pkg3]: what's changed

Or if the count of mainly changed packages are more than 3, use

  • *: what's changed

@longfangsong longfangsong changed the title more-txn-options txn: Use TransactionOption in store/tikv module Mar 11, 2021
@ti-srebot
Copy link
Contributor

No release note, Please follow https://github.com/pingcap/community/blob/master/contributors/release-note-checker.md

@longfangsong
Copy link
Contributor Author

longfangsong commented Mar 11, 2021 •
edited
Loading

/sig transaction

@longfangsong
Copy link
Contributor Author

/sig sql-infra

@ti-chi-bot ti-chi-bot added sig/sql-infra SIG: SQL Infra sig/transaction SIG:Transaction labels Mar 11, 2021
@longfangsong
Copy link
Contributor Author

@Yisaer PTAL

longfangsong
longfangsong commented Mar 11, 2021
View reviewed changes
store/tikv/txn.go Outdated Show resolved Hide resolved
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 15, 2021
Yisaer
Yisaer reviewed Apr 6, 2021
View reviewed changes
Copy link
Contributor

@Yisaer Yisaer left a comment

Choose a reason for hiding this comment

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

Rest LGTM, plz fix the conflict.

store/tikv/txn.go Outdated Show resolved Hide resolved
@longfangsong longfangsong force-pushed the more-txn-options branch 2 times, most recently from e8a6172 to 6134cce Compare April 7, 2021 07:55
@longfangsong longfangsong requested a review from Yisaer April 7, 2021 08:07
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 7, 2021
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 17, 2021
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 30, 2021
Yisaer
Yisaer reviewed May 7, 2021
View reviewed changes
Copy link
Contributor

@Yisaer Yisaer left a comment

Choose a reason for hiding this comment

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

Rest LGTM

store/tikv/txn.go Show resolved Hide resolved
@ti-chi-bot ti-chi-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 May 7, 2021
@longfangsong longfangsong requested a review from Yisaer May 7, 2021 10:49
@ti-chi-bot ti-chi-bot requested a review from xhebox May 8, 2021 13:37
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Yisaer
  • xhebox

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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@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 May 10, 2021
@xhebox
Copy link
Contributor

xhebox commented May 10, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: c8ec6dc

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 10, 2021
@ti-chi-bot
Copy link
Member

/run-all-tests

This bot automatically retries jobs that failed on can merge PRs (send feedback to hi-rustin).

Silence the bot with the /merge cancel comment for consistent failures.

@ti-chi-bot
Copy link
Member

/run-all-tests

This bot automatically retries jobs that failed on can merge PRs (send feedback to hi-rustin).

Silence the bot with the /merge cancel comment for consistent failures.

@Rustin170506
Copy link
Member

/run-check_dev_2

@ti-chi-bot
Copy link
Member

/run-all-tests

This bot automatically retries jobs that failed on can merge PRs (send feedback to hi-rustin).

Silence the bot with the /merge cancel comment for consistent failures.

1 similar comment
@ti-chi-bot
Copy link
Member

/run-all-tests

This bot automatically retries jobs that failed on can merge PRs (send feedback to hi-rustin).

Silence the bot with the /merge cancel comment for consistent failures.

@ti-chi-bot
Copy link
Member

@longfangsong: 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

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 ti-chi-bot merged commit 7c19975 into pingcap:master May 11, 2021
@longfangsong longfangsong mentioned this pull request May 12, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xhebox xhebox xhebox approved these changes

@Yisaer Yisaer Yisaer approved these changes

Assignees
No one assigned
Labels
sig/sql-infra SIG: SQL Infra sig/transaction SIG:Transaction size/XL Denotes a PR that changes 500-999 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.
7 participants
@longfangsong @ti-srebot @sre-bot @Yisaer @ti-chi-bot @xhebox @Rustin170506