This repository has been archived by the owner on Nov 24, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 188
loader/syncer: filter context cancel error while executing sqls (#355) #382
Merged
csuzhangxc
merged 3 commits into
pingcap:release-1.0
from
lichunzhu:czli/release1.0/filterContextCancelError
Nov 29, 2019
Merged
loader/syncer: filter context cancel error while executing sqls (#355) #382
csuzhangxc
merged 3 commits into
pingcap:release-1.0
from
lichunzhu:czli/release1.0/filterContextCancelError
Nov 29, 2019
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lichunzhu
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/cherry-pick
This PR is just a cherry-pick (backport)
labels
Nov 28, 2019
lichunzhu
added
status/DNM
Do not merge, test is failing or blocked by another PR
and removed
status/PTAL
This PR is ready for review. Add this label back after committing new changes
labels
Nov 28, 2019
lichunzhu
changed the title
add ErrorFilterContextCanceled filter context cancel error
loader/syncer: filter context cancel error while executing sqls (#355)
Nov 28, 2019
…/release1.0/filterContextCancelError
/run-all-tests tidb=release-3.0 |
csuzhangxc
reviewed
Nov 29, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Codecov Report
@@ Coverage Diff @@
## release-1.0 #382 +/- ##
===================================================
- Coverage 57.3099% 57.1614% -0.1485%
===================================================
Files 158 159 +1
Lines 16074 16135 +61
===================================================
+ Hits 9212 9223 +11
- Misses 5956 6007 +51
+ Partials 906 905 -1 |
@WangXiangUSTC PTAL |
WangXiangUSTC
approved these changes
Nov 29, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
WangXiangUSTC
added
status/LGT2
Two reviewers already commented LGTM, ready for merge
and removed
status/LGT1
One reviewer already commented LGTM
labels
Nov 29, 2019
csuzhangxc
removed
the
status/DNM
Do not merge, test is failing or blocked by another PR
label
Nov 29, 2019
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/cherry-pick
This PR is just a cherry-pick (backport)
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
cherry-pick #355 and #381 to release-1.0
What problem does this PR solve?
When an error occurs and the context in loader/syncer is canceled, the normally running sql will be canceled and return a
context.Canceled
error, which will confuse the users.What is changed and how it works?
Filter all the
context.Canceled
in loader/syncer. Don't return error and don't print log.Check List
Tests
Related changes