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

dm-worker/: refine query error(#512) #519

Merged
merged 4 commits into from
Mar 10, 2020
Merged

dm-worker/: refine query error(#512) #519

merged 4 commits into from
Mar 10, 2020

Conversation

lichunzhu
Copy link
Contributor

cherry-pick #512

What problem does this PR solve?

#509
Current DM-worker may have no currUnit when some error occurs during Init, which will cause nil-pointer error while using worker.QueryError.

What is changed and how it works?

Avoid query currUnit.Error when currUnit is nil. Use result.Errors as Error when currUnit is nil.

Check List

Tests

  • Unit test
  • Integration test

@lichunzhu lichunzhu added the type/cherry-pick This PR is just a cherry-pick (backport) label Mar 6, 2020
@lichunzhu
Copy link
Contributor Author

/run-all-tests tidb=release-3.0

@lichunzhu lichunzhu added the status/DNM Do not merge, test is failing or blocked by another PR label Mar 6, 2020
@lichunzhu
Copy link
Contributor Author

/run-all-tests tidb=release-3.0

@lichunzhu
Copy link
Contributor Author

/run-all-tests tidb=release-3.0

@lichunzhu
Copy link
Contributor Author

/run-all-tests tidb=release-3.0

@codecov
Copy link

codecov bot commented Mar 7, 2020 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (release-1.0@f7a206e). Click here to learn what that means.
The diff coverage is 36.6666%.

@@               Coverage Diff                @@
##             release-1.0       #519   +/-   ##
================================================
  Coverage               ?   57.3006%           
================================================
  Files                  ?        161           
  Lines                  ?      16656           
  Branches               ?          0           
================================================
  Hits                   ?       9544           
  Misses                 ?       6166           
  Partials               ?        946

@lichunzhu lichunzhu changed the title dm-worker/: refine query error dm-worker/: refine query error(#512) Mar 7, 2020
@lichunzhu lichunzhu added status/PTAL This PR is ready for review. Add this label back after committing new changes and removed status/DNM Do not merge, test is failing or blocked by another PR labels Mar 9, 2020
csuzhangxc
csuzhangxc reviewed Mar 10, 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/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 10, 2020
WangXiangUSTC
WangXiangUSTC approved these changes Mar 10, 2020
View reviewed changes
Copy link
Contributor

@WangXiangUSTC WangXiangUSTC left a comment

Choose a reason for hiding this comment

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

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 10, 2020
@lichunzhu lichunzhu merged commit 17a299c into pingcap:release-1.0 Mar 10, 2020
@lichunzhu lichunzhu deleted the release-1.0 branch March 10, 2020 09:23
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@csuzhangxc csuzhangxc csuzhangxc left review comments

@WangXiangUSTC WangXiangUSTC WangXiangUSTC approved these changes

Assignees
No one assigned
Labels
status/LGT2 Two reviewers already commented LGTM, ready for merge 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
@lichunzhu @csuzhangxc @WangXiangUSTC