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

fix: don't forbid DM-master leader startup for unexpected DDL locks (#1193) #1199

Merged
merged 1 commit into from
Oct 22, 2020
Merged

fix: don't forbid DM-master leader startup for unexpected DDL locks (#1193) #1199

merged 1 commit into from
Oct 22, 2020

Conversation

ti-srebot
Copy link

cherry-pick #1193 to release-2.0

What problem does this PR solve?

fix #1185

What is changed and how it works?

  • don't forbid DM-master leader startup for unexpected DDL locks

Check List

Tests

  • Unit test
  • Integration test

Code changes

  • Has exported function/method change
  • Has exported variable/fields change
  • Has interface methods change
  • Has persistent data change

Side effects

  • Increased code complexity

Related changes

  • Need to cherry-pick to the release branch
  • Need to be included in the release note

@csuzhangxc @ti-srebot
cherry pick pingcap#1193 to release-2.0
97b0493 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Oct 22, 2020
Merged
@ti-srebot ti-srebot added priority/normal Minor change, requires approval from ≥1 primary reviewer type/bug-fix Bug fix type/cherry-pick This PR is just a cherry-pick (backport) first-time-contributor labels Oct 22, 2020
@lance6716
Copy link
Collaborator

LGTM

@ti-srebot ti-srebot added the status/LGT1 One reviewer already commented LGTM label Oct 22, 2020
csuzhangxc
csuzhangxc approved these changes Oct 22, 2020
View reviewed changes
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

@csuzhangxc csuzhangxc added status/LGT2 Two reviewers already commented LGTM, ready for merge and removed status/LGT1 One reviewer already commented LGTM labels Oct 22, 2020
@csuzhangxc csuzhangxc added this to the v2.0.0 milestone Oct 22, 2020
@csuzhangxc
Copy link
Member

/run-all-tests

@csuzhangxc
Copy link
Member

/run-all-tests

hudson.plugins.git.GitException: Failed to fetch from git@github.com:pingcap/dm.git

@csuzhangxc csuzhangxc merged commit f89bb90 into pingcap:release-2.0 Oct 22, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@csuzhangxc csuzhangxc csuzhangxc approved these changes

@GMHDBJD GMHDBJD Awaiting requested review from GMHDBJD

@lance6716 lance6716 Awaiting requested review from lance6716

Assignees
No one assigned
Labels
first-time-contributor priority/normal Minor change, requires approval from ≥1 primary reviewer 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
Milestone
v2.0.0
Development

Successfully merging this pull request may close these issues.
3 participants
@ti-srebot @lance6716 @csuzhangxc