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

dm-master: fix DM-master can not exit when starting timeout #513

Merged
merged 3 commits into from
Mar 4, 2020

Conversation

csuzhangxc
Copy link
Member

What problem does this PR solve?

fix #507

What is changed and how it works?

see comments in dm/master/etcd.go from L61 to L68.

Check List

Tests

  • Unit test
  • Integration test

@csuzhangxc csuzhangxc added priority/normal Minor change, requires approval from ≥1 primary reviewer status/WIP This PR is still work in progress type/bug-fix Bug fix labels Mar 4, 2020
@csuzhangxc
Copy link
Member Author

/run-all-tests tidb=release-3.0

2 similar comments
@csuzhangxc
Copy link
Member Author

/run-all-tests tidb=release-3.0

@csuzhangxc
Copy link
Member Author

/run-all-tests tidb=release-3.0

@codecov
Copy link

codecov bot commented Mar 4, 2020

Codecov Report

❗ No coverage uploaded for pull request base (master@344e388). Click here to learn what that means.
The diff coverage is n/a.

@@             Coverage Diff             @@
##             master       #513   +/-   ##
===========================================
  Coverage          ?   56.3478%           
===========================================
  Files             ?        184           
  Lines             ?      18581           
  Branches          ?          0           
===========================================
  Hits              ?      10470           
  Misses            ?       7060           
  Partials          ?       1051

@csuzhangxc csuzhangxc added status/PTAL This PR is ready for review. Add this label back after committing new changes and removed status/WIP This PR is still work in progress labels Mar 4, 2020
@csuzhangxc
Copy link
Member Author

@WangXiangUSTC @lichunzhu PTAL

dm/master/etcd.go Outdated Show resolved Hide resolved
Co-Authored-By: Chunzhu Li <lichunzhu@pingcap.com>
@csuzhangxc
Copy link
Member Author

/run-all-tests tidb=release-3.0

Copy link
Contributor

@lichunzhu lichunzhu left a comment

Choose a reason for hiding this comment

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

LGTM

@lichunzhu lichunzhu added status/LGT1 One reviewer already commented LGTM and removed status/PTAL This PR is ready for review. Add this label back after committing new changes labels Mar 4, 2020
@csuzhangxc
Copy link
Member Author

/run-all-tests tidb=release-3.0

@WangXiangUSTC
Copy link
Contributor

LGTM

@WangXiangUSTC WangXiangUSTC added status/LGT2 Two reviewers already commented LGTM, ready for merge and removed status/LGT1 One reviewer already commented LGTM labels Mar 4, 2020
@csuzhangxc
Copy link
Member Author

/run-all-tests tidb=release-3.0

1 similar comment
@csuzhangxc
Copy link
Member Author

/run-all-tests tidb=release-3.0

@csuzhangxc csuzhangxc merged commit e256885 into pingcap:master Mar 4, 2020
@csuzhangxc csuzhangxc deleted the fix-etcd-close branch March 4, 2020 09:42
lichunzhu pushed a commit to lichunzhu/dm that referenced this pull request Apr 6, 2020
lichunzhu pushed a commit to lichunzhu/dm that referenced this pull request Apr 6, 2020
lichunzhu pushed a commit to lichunzhu/dm that referenced this pull request Apr 7, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

HA: DM-master can not exit when starting timeout
3 participants