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

support resolve specified lock keys (#10292) #11889

Merged
merged 5 commits into from
Aug 27, 2019
Merged

support resolve specified lock keys (#10292) #11889

merged 5 commits into from
Aug 27, 2019

Conversation

zhangjinpeng87
Copy link
Contributor

What problem does this PR solve?

Cherry-pick #10292

Check List

Tests

  • Unit test

@zhangjinpeng87
2.1 cherry-pick resolve specified keys
a5cbec3 
Signed-off-by: zhangjinpeng1987 <zhangjinpeng@pingcap.com>
@zhangjinpeng87
update kvproto
18e48bc 
Signed-off-by: zhangjinpeng1987 <zhangjinpeng@pingcap.com>
@zhangjinpeng87
kvproto: use release-2.1 branch
4f1361f 
Signed-off-by: zhangjinpeng1987 <zhangjinpeng@pingcap.com>
@zhangjinpeng87
Make go mod tidy pass
215487f 
Signed-off-by: zhangjinpeng1987 <zhangjinpeng@pingcap.com>
MyonKeminta
MyonKeminta approved these changes Aug 27, 2019
View reviewed changes
Copy link
Contributor

@MyonKeminta MyonKeminta left a comment

Choose a reason for hiding this comment

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

LGTM

@tiancaiamao
Copy link
Contributor

LGTM

@tiancaiamao tiancaiamao added the status/LGT2 Indicates that a PR has LGTM 2. label Aug 27, 2019
@disksing
Copy link
Contributor

Need #11725 ?

@zhangjinpeng87
Copy link
Contributor Author

Need #11725?

@disksing Currently i don't think so, one reason is the accurate number of keys is not necessary. The most important reason is #10292 has been tested for a long time, and it works well, but #11725 hasn't. Maybe we will cherry pick 11725 to 2.1 after it has tested for a long time.

@zz-jason zz-jason changed the title [2.1 cherry-pick] resolve specified keys support resolve specified lock keys (#10292) Aug 27, 2019
@zz-jason zz-jason added status/can-merge Indicates a PR has been approved by a committer. type/2.1 cherry-pick labels Aug 27, 2019
@sre-bot
Copy link
Contributor

sre-bot commented Aug 27, 2019

/run-all-tests

@sre-bot sre-bot merged commit 452dd0b into pingcap:release-2.1 Aug 27, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MyonKeminta MyonKeminta MyonKeminta approved these changes

@tiancaiamao tiancaiamao tiancaiamao approved these changes

@disksing disksing Awaiting requested review from disksing

Assignees
No one assigned
Labels
component/tikv 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.
6 participants
@zhangjinpeng87 @tiancaiamao @disksing @sre-bot @MyonKeminta @zz-jason