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

store/tikv: set memdb's size limits after create #24215

Merged
merged 7 commits into from
Apr 25, 2021
Merged

store/tikv: set memdb's size limits after create #24215

merged 7 commits into from
Apr 25, 2021

Conversation

disksing
Copy link
Contributor

Signed-off-by: disksing i@disksing.com

What problem does this PR solve?

memdb depends on kv.TxnEntrySizeLimit and kv.TxnTotalSIzeLimit to initialize.

Part of #22513

What is changed and how it works?

What's Changed:

  • create with unlimit size
  • add SetEntrySizeLimit to update limits after create
  • remove redundant checks

Check List

Tests

  • Unit test

Release note

  • No release note

@disksing
store/tikv: set memdb's size limits after create
ae85e30 
Signed-off-by: disksing <i@disksing.com>
@disksing
remove redundant check
e993e06 
Signed-off-by: disksing <i@disksing.com>
@disksing disksing added the sig/transaction SIG:Transaction label Apr 22, 2021
@ti-chi-bot ti-chi-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Apr 22, 2021
@sre-bot
Copy link
Contributor

sre-bot commented Apr 22, 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

disksing
disksing commented Apr 22, 2021
View reviewed changes
store/tikv/2pc.go
@@ -397,9 +396,6 @@ func (c *twoPhaseCommitter) initKeysAndMutations() error {
}
c.txnSize = size

if size > int(tidbkv.TxnTotalSizeLimit) {
return tidbkv.ErrTxnTooLarge.GenWithStackByArgs(size)
}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

It looks we don't need it because it is checked whenever memdb is updated.

AndreMouche
AndreMouche approved these changes Apr 23, 2021
View reviewed changes
Copy link
Contributor

@AndreMouche AndreMouche left a comment

Choose a reason for hiding this comment

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

LGTM

store/tikv/unionstore/union_store.go
@@ -139,6 +139,12 @@ func (us *KVUnionStore) GetOption(opt int) interface{} {
return us.opts[opt]
}

// SetEntrySizeLimit sets the size limit for each entry and total buffer.
func (us *KVUnionStore) SetEntrySizeLimit(entryLimit, bufferLimit uint64) {
Copy link
Contributor

Choose a reason for hiding this comment

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

So we should attention that it is ok for tikv-client to update the entrysizelimit in a transaction.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 23, 2021
@AndreMouche
Copy link
Contributor

/run-check_dev_2

sticnarf
sticnarf approved these changes Apr 25, 2021
View reviewed changes
Copy link
Contributor

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

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • AndreMouche
  • sticnarf

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 Apr 25, 2021
@sticnarf
Copy link
Contributor

Uh, TestLargeRequest fails

@disksing
Copy link
Contributor Author

Uh, TestLargeRequest fails

I'll take a look.

@disksing
fix test
7c3b365 
Signed-off-by: disksing <i@disksing.com>
sticnarf
sticnarf approved these changes Apr 25, 2021
View reviewed changes
Copy link
Contributor

@sticnarf sticnarf left a comment

Choose a reason for hiding this comment

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

LGTM

@disksing
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 9f3d847

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 25, 2021
@ti-chi-bot ti-chi-bot merged commit 4ac76b4 into pingcap:master Apr 25, 2021
@disksing disksing deleted the entry-size-limit branch April 25, 2021 06:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AndreMouche AndreMouche AndreMouche approved these changes

@sticnarf sticnarf sticnarf approved these changes

Assignees
No one assigned
Labels
sig/transaction SIG:Transaction 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.
5 participants
@disksing @sre-bot @AndreMouche @ti-chi-bot @sticnarf