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

config: fix empty flavor for source (#1385) #1395

Merged
merged 1 commit into from
Jan 21, 2021
Merged

config: fix empty flavor for source (#1385) #1395

merged 1 commit into from
Jan 21, 2021

Conversation

ti-srebot
Copy link

@ti-srebot ti-srebot commented Jan 21, 2021 •
edited
Loading

cherry-pick #1385 to release-2.0
You can switch your code base to this Pull Request by using git-extras:

# In dm repo:
git pr https://github.com/pingcap/dm/pull/1395

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/dm.git pr/1395:release-2.0-65d3962ce8cc

What problem does this PR solve?

close #1380 #1379

What is changed and how it works?

  • adjust source config before verify
  • try mysql/mariadb if flavor is empty

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

@GMHDBJD @ti-srebot
cherry pick pingcap#1385 to release-2.0
be6a3c9 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Jan 21, 2021
Merged
@ti-srebot ti-srebot added needs-update-release-note This PR should be added into release notes. Remove this label once the release notes are updated status/PTAL This PR is ready for review. Add this label back after committing new changes type/bug-fix Bug fix type/cherry-pick This PR is just a cherry-pick (backport) labels Jan 21, 2021
lance6716
lance6716 approved these changes Jan 21, 2021
View reviewed changes
Copy link
Collaborator

@lance6716 lance6716 left a comment

Choose a reason for hiding this comment

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

LGTM

@GMHDBJD GMHDBJD merged commit fd608ec into pingcap:release-2.0 Jan 21, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lance6716 lance6716 lance6716 approved these changes

@3pointer 3pointer Awaiting requested review from 3pointer

Assignees
No one assigned
Labels
needs-update-release-note This PR should be added into release notes. Remove this label once the release notes are updated status/PTAL This PR is ready for review. Add this label back after committing new changes type/bug-fix Bug fix type/cherry-pick This PR is just a cherry-pick (backport)
Projects
None yet
Milestone
No milestone
Development

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