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

id: fix the bug that id may be duplicated #3322

Merged
merged 3 commits into from
Jan 4, 2021
Merged

Conversation

HunDunDM
Copy link
Member

@HunDunDM HunDunDM commented Jan 4, 2021

Signed-off-by: Zheng Xiangsheng hundundm@gmail.com

What problem does this PR solve?

What is changed and how it works?

  • id: fix the bug that id may be duplicated

Check List

Tests

  • Unit test

Related changes

  • Need to cherry-pick to the release branch

Release note

  • No release note

Signed-off-by: Zheng Xiangsheng <hundundm@gmail.com>
Signed-off-by: Zheng Xiangsheng <hundundm@gmail.com>
Signed-off-by: Zheng Xiangsheng <hundundm@gmail.com>
@HunDunDM HunDunDM added type/bugfix This PR fixes a bug. needs-cherry-pick-release-4.0 The PR needs to cherry pick to release-4.0 branch. labels Jan 4, 2021
@ti-chi-bot ti-chi-bot requested a review from lhy1024 January 4, 2021 11:03
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 4, 2021
@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 Jan 4, 2021
@codecov
Copy link

codecov bot commented Jan 4, 2021

Codecov Report

Merging #3322 (4d6d298) into master (a00f33a) will increase coverage by 0.09%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3322      +/-   ##
==========================================
+ Coverage   74.68%   74.77%   +0.09%     
==========================================
  Files         243      243              
  Lines       23140    23140              
==========================================
+ Hits        17281    17304      +23     
+ Misses       4286     4266      -20     
+ Partials     1573     1570       -3     
Flag Coverage Δ
unittests 74.77% <100.00%> (+0.09%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
server/id/id.go 76.19% <100.00%> (ø)
pkg/tempurl/tempurl.go 45.00% <0.00%> (-15.00%) ⬇️
server/member/member.go 63.04% <0.00%> (-3.81%) ⬇️
server/schedulers/random_merge.go 56.14% <0.00%> (-3.51%) ⬇️
server/schedule/operator/step.go 67.44% <0.00%> (-1.67%) ⬇️
server/tso/allocator_manager.go 75.85% <0.00%> (-0.41%) ⬇️
server/grpc_service.go 56.17% <0.00%> (-0.17%) ⬇️
server/tso/tso.go 81.13% <0.00%> (+0.62%) ⬆️
server/core/storage.go 68.80% <0.00%> (+0.79%) ⬆️
server/cluster/cluster.go 84.20% <0.00%> (+0.89%) ⬆️
... and 6 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a00f33a...4d6d298. Read the comment docs.

@lhy1024
Copy link
Contributor

lhy1024 commented Jan 4, 2021

/merge

@ti-chi-bot
Copy link
Member

@lhy1024: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

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

@ti-chi-bot
Copy link
Member

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

Commit hash: 4d6d298

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 4, 2021
rleungx added a commit to ti-srebot/pd that referenced this pull request Jan 4, 2021
Signed-off-by: Ryan Leung <rleungx@gmail.com>
@ti-chi-bot ti-chi-bot merged commit 7884259 into tikv:master Jan 4, 2021
ti-srebot pushed a commit to ti-srebot/pd that referenced this pull request Jan 4, 2021
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #3323

@nolouch
Copy link
Contributor

nolouch commented Jan 4, 2021

/run-cherry-picker

ti-srebot pushed a commit to ti-srebot/pd that referenced this pull request Jan 4, 2021
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0-rc in PR #3324

@HunDunDM HunDunDM deleted the fix-id branch January 4, 2021 16:13
ti-chi-bot pushed a commit that referenced this pull request Jan 5, 2021
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: 混沌DM <hundundm@gmail.com>
ti-chi-bot added a commit that referenced this pull request Jan 5, 2021
* cherry pick #3305 to release-5.0-rc

Signed-off-by: Ryan Leung <rleungx@gmail.com>

* cherry pick #3322 to release-5.0-rc

Signed-off-by: Ryan Leung <rleungx@gmail.com>

Co-authored-by: Ryan Leung <rleungx@gmail.com>
Co-authored-by: ShuNing <nolouch@gmail.com>
Co-authored-by: Ti Prow Robot <71242396+ti-community-prow-bot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-cherry-pick-release-4.0 The PR needs to cherry pick to release-4.0 branch. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

DDL hangs, DML reports PD server timeout and many regions miss peers
6 participants