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

error_message: cherry pick #546 #733

Merged
merged 2 commits into from
Jun 15, 2020
Merged

error_message: cherry pick #546 #733

merged 2 commits into from
Jun 15, 2020

Conversation

GMHDBJD
Copy link
Collaborator

@GMHDBJD GMHDBJD commented Jun 15, 2020

manualy cherrypick #546

What problem does this PR solve?

use terror.Message(err) to replace errors.ErrorStack(err) in

  • NewProcessError
  • dm/ctl/master/query_error.go
  • dm/ctl/master/query_status.go

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test

@codecov
Copy link

codecov bot commented Jun 15, 2020

Codecov Report

Merging #733 into release-1.0 will increase coverage by 0.0136%.
The diff coverage is 31.2500%.

@@                 Coverage Diff                 @@
##           release-1.0       #733        +/-   ##
===================================================
+ Coverage      57.8399%   57.8535%   +0.0136%     
===================================================
  Files              166        166                
  Lines            16990      16986         -4     
===================================================
  Hits              9827       9827                
+ Misses            6207       6202         -5     
- Partials           956        957         +1

@csuzhangxc csuzhangxc added needs-update-release-note This PR should be added into release notes. Remove this label once the release notes are updated 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/enhancement Performance improvement or refactoring labels Jun 15, 2020
@csuzhangxc csuzhangxc added this to the v1.0.6 milestone Jun 15, 2020
csuzhangxc
csuzhangxc reviewed Jun 15, 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 Jun 15, 2020
WangXiangUSTC
WangXiangUSTC approved these changes Jun 15, 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 Jun 15, 2020
@GMHDBJD GMHDBJD merged commit 533ab57 into pingcap:release-1.0 Jun 15, 2020
@GMHDBJD GMHDBJD deleted the cherryPick546 branch June 15, 2020 05:07
@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 Jun 17, 2020
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
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/enhancement Performance improvement or refactoring
Projects
None yet
Milestone
v1.0.6
Development

Successfully merging this pull request may close these issues.
4 participants
@GMHDBJD @csuzhangxc @WangXiangUSTC @Kuri-su