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

*: fix DB connection close and all_mode integration test #403

Merged
merged 7 commits into from
Dec 17, 2019

Conversation

csuzhangxc
Copy link
Member

@csuzhangxc csuzhangxc commented Dec 6, 2019

What problem does this PR solve?

  • resume-task may fail because resetBaseConnFn returning an invalid existing connection
  • all_mode may fail with /tmp/dm_test/all_mode/worker1/log/dm-worker.log dosen't contain dispatch auto resume task.

What is changed and how it works?

  • close the connection but do not put it back to the underlying connection pool
  • wait for the task running before kill TiDB

Check List

Tests

  • Integration test

Related changes

  • Need to cherry-pick to the release branch

@csuzhangxc csuzhangxc added priority/unimportant Really minor change, requires approval from secondary reviewers status/PTAL This PR is ready for review. Add this label back after committing new changes type/bug-fix Bug fix type/test Changes related to test cases needs-cherry-pick-release-1.0 This PR should be cherry-picked to release-1.0. Remove this label after cherry-picked to release-1.0 labels Dec 6, 2019
@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
Copy link
Member Author

/run-all-tests tidb=release-2.1

@csuzhangxc
Copy link
Member Author

/run-all-tests tidb=release-3.0

@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 Dec 17, 2019

Codecov Report

Merging #403 into master will increase coverage by 1.2014%.
The diff coverage is 0%.

@@               Coverage Diff               @@
##             master      #403        +/-   ##
===============================================
+ Coverage   56.2905%   57.492%   +1.2014%     
===============================================
  Files           166       165         -1     
  Lines         17248     16898       -350     
===============================================
+ Hits           9709      9715         +6     
+ Misses         6585      6231       -354     
+ Partials        954       952         -2

@csuzhangxc
Copy link
Member Author

/run-all-tests tidb=release-3.0

@csuzhangxc
Copy link
Member Author

/run-all-tests tidb=release-3.0

@csuzhangxc csuzhangxc changed the title tests: fix all_mode doesn't contain "dispatch auto resume task" *: fix DB connection close and all_mode integration test Dec 17, 2019
@csuzhangxc
Copy link
Member Author

@3pointer @amyangfei PTAL

Copy link
Contributor

@amyangfei amyangfei left a comment

Choose a reason for hiding this comment

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

LGTM

@amyangfei amyangfei 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 Dec 17, 2019
@3pointer 3pointer removed the status/LGT1 One reviewer already commented LGTM label Dec 17, 2019
@3pointer 3pointer added the status/LGT2 Two reviewers already commented LGTM, ready for merge label Dec 17, 2019
@csuzhangxc csuzhangxc merged commit 6612cf7 into pingcap:master Dec 17, 2019
@csuzhangxc csuzhangxc deleted the fix-test-all-mode branch December 17, 2019 09:21
@sre-bot
Copy link

sre-bot commented Dec 17, 2019

cherry pick to release-1.0 in PR #435

@sre-bot sre-bot added already-cherry-pick-1.0 The related PR is already cherry-picked to release-1.0. Add this label once the PR is cherry-picked and removed needs-cherry-pick-release-1.0 This PR should be cherry-picked to release-1.0. Remove this label after cherry-picked to release-1.0 labels Dec 17, 2019
@csuzhangxc csuzhangxc added the needs-update-release-note This PR should be added into release notes. Remove this label once the release notes are updated label Dec 17, 2019
csuzhangxc added a commit to csuzhangxc/dm that referenced this pull request Dec 17, 2019
@csuzhangxc csuzhangxc added already-update-release-note The release note is updated. Add this label once the release note is updated and removed needs-update-release-note This PR should be added into release notes. Remove this label once the release notes are updated labels Mar 13, 2020
lichunzhu pushed a commit to lichunzhu/dm that referenced this pull request Apr 6, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
already-cherry-pick-1.0 The related PR is already cherry-picked to release-1.0. Add this label once the PR is cherry-picked already-update-release-note The release note is updated. Add this label once the release note is updated priority/unimportant Really minor change, requires approval from secondary reviewers status/LGT2 Two reviewers already commented LGTM, ready for merge type/bug-fix Bug fix type/test Changes related to test cases
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants