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) #436

Merged
merged 3 commits into from
Dec 18, 2019
Merged

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

merged 3 commits into from
Dec 18, 2019

Conversation

csuzhangxc
Copy link
Member

cherry-pick #403 to release-1.0

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/normal Minor change, requires approval from ≥1 primary reviewer 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) needs-update-release-note This PR should be added into release notes. Remove this label once the release notes are updated labels Dec 17, 2019
@csuzhangxc csuzhangxc changed the title Pick 403 *: fix DB connection close and all_mode integration test (#403) Dec 17, 2019
@csuzhangxc
Copy link
Member Author

/run-all-tests tidb=release-3.0

@csuzhangxc csuzhangxc mentioned this pull request Dec 17, 2019
Closed
@csuzhangxc csuzhangxc added this to the v1.0.4 milestone Dec 17, 2019
@csuzhangxc
Copy link
Member Author

/run-all-tests tidb=release-3.0

@csuzhangxc
Copy link
Member Author

@3pointer @amyangfei PTAL

@codecov
Copy link

codecov bot commented Dec 17, 2019

Codecov Report

Merging #436 into release-1.0 will decrease coverage by 0.0172%.
The diff coverage is 0%.

@@                 Coverage Diff                 @@
##           release-1.0       #436        +/-   ##
===================================================
- Coverage      57.0981%   57.0809%   -0.0172%     
===================================================
  Files              161        161                
  Lines            16596      16601         +5     
===================================================
  Hits              9476       9476                
- Misses            6184       6189         +5     
  Partials           936        936

amyangfei
amyangfei reviewed Dec 17, 2019
View reviewed changes
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
@csuzhangxc csuzhangxc added status/LGT2 Two reviewers already commented LGTM, ready for merge and removed status/LGT1 One reviewer already commented LGTM labels Dec 18, 2019
@csuzhangxc csuzhangxc merged commit df2f4d7 into pingcap:release-1.0 Dec 18, 2019
@csuzhangxc csuzhangxc deleted the pick-403 branch December 18, 2019 04:19
@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
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@amyangfei amyangfei amyangfei left review comments

@3pointer 3pointer 3pointer approved these changes

Assignees
No one assigned
Labels
already-update-release-note The release note is updated. Add this label once the release note is updated 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
v1.0.4
Development

Successfully merging this pull request may close these issues.
3 participants
@csuzhangxc @amyangfei @3pointer