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

syncer: fix ignore canceled error (#401) #402

Merged
merged 1 commit into from
Dec 5, 2019

Conversation

sre-bot
Copy link

@sre-bot sre-bot commented Dec 5, 2019

cherry-pick #401 to release-1.0


What problem does this PR solve?

in #355, ignore canceled errors for executing SQLs is introduced.

but miss to ignore the canceled errors for executing DMLs.

What is changed and how it works?

check !utils.IsContextCanceledError(err) before s.runFatalChan <- unit.NewProcessError(errType, err) for executing DMLs as we did for DDL.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
    • hack the code for executing DMLs and return an error in one goroutine
    • obverse the log and result of query-status for context canceled error

Related changes

@sre-bot sre-bot added priority/normal Minor change, requires approval from ≥1 primary reviewer needs-update-release-note This PR should be added into release notes. Remove this label once the release notes are updated type/bug-fix Bug fix type/cherry-pick This PR is just a cherry-pick (backport) labels Dec 5, 2019
@csuzhangxc
Copy link
Member

/run-all-tests tidb=release-3.0

@codecov
Copy link

codecov bot commented Dec 5, 2019

Codecov Report

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

@@               Coverage Diff                @@
##             release-1.0       #402   +/-   ##
================================================
  Coverage               ?   57.2499%           
================================================
  Files                  ?        159           
  Lines                  ?      16145           
  Branches               ?          0           
================================================
  Hits                   ?       9243           
  Misses                 ?       6000           
  Partials               ?        902

@csuzhangxc
Copy link
Member

@WangXiangUSTC @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 the status/LGT1 One reviewer already commented LGTM label Dec 5, 2019
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 Dec 5, 2019
@csuzhangxc csuzhangxc merged commit cd0ceea into pingcap:release-1.0 Dec 5, 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
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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
Development

Successfully merging this pull request may close these issues.

4 participants