Skip to content
This repository has been archived by the owner on Nov 24, 2023. It is now read-only.

shardddl: fix lock not found after try sync (#939) #944

Merged
merged 4 commits into from
Aug 28, 2020

Conversation

ti-srebot
Copy link

cherry-pick #939 to release-2.0


What problem does this PR solve?

close #936

What is changed and how it works?

return lock instead of lockID in TrySync, use this lock if the lock was deleted by others

Check List

Tests

  • hard to test

@ti-srebot ti-srebot added already-update-release-note The release note is updated. Add this label once the release note is updated type/bug-fix Bug fix type/cherry-pick This PR is just a cherry-pick (backport) labels Aug 28, 2020
Copy link
Member

@csuzhangxc csuzhangxc left a comment

Choose a reason for hiding this comment

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

LGTM

@lance6716
Copy link
Collaborator

LGTM

@ti-srebot ti-srebot added the status/LGT1 One reviewer already commented LGTM label Aug 28, 2020
@GMHDBJD
Copy link
Collaborator

GMHDBJD commented Aug 28, 2020

/run-all-tests

@lance6716
Copy link
Collaborator

/run-all-tests

maybe this week we could merge fixTest to reduce CI fail

@csuzhangxc csuzhangxc added status/LGT2 Two reviewers already commented LGTM, ready for merge and removed status/LGT1 One reviewer already commented LGTM labels Aug 28, 2020
@csuzhangxc csuzhangxc added this to the v2.0.0 RC.2 milestone Aug 28, 2020
@csuzhangxc csuzhangxc merged commit a358aca into pingcap:release-2.0 Aug 28, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
already-update-release-note The release note is updated. Add this label once the release note is updated status/LGT2 Two reviewers already commented LGTM, ready for merge type/bug-fix Bug fix type/cherry-pick This PR is just a cherry-pick (backport)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants