Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ErrQueryInterrupted with parameters #1124

Merged
merged 4 commits into from
Feb 2, 2024

Conversation

ekexium
Copy link
Contributor

@ekexium ekexium commented Jan 17, 2024

Ref pingcap/tidb#49643

We have to return the error with the signal to enable TiDB to convert it to the actual error type.

Signed-off-by: ekexium <eke@fastmail.com>
error/error.go Outdated Show resolved Hide resolved
@cfzjywxk cfzjywxk merged commit 70c148e into tikv:master Feb 2, 2024
10 checks passed
@ti-chi-bot ti-chi-bot added the needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. label Feb 2, 2024
ekexium added a commit to ekexium/client-go that referenced this pull request Feb 18, 2024
* feat: ErrQueryInterrupted with parameters

Signed-off-by: ekexium <eke@fastmail.com>

* Revert "Revert "fix: check kill signal against 0 (tikv#1102)" (tikv#1129)"

This reverts commit 3480b5e.

Signed-off-by: ekexium <eke@fastmail.com>

---------

Signed-off-by: ekexium <eke@fastmail.com>
Co-authored-by: cfzjywxk <lsswxrxr@163.com>
ekexium added a commit to ekexium/client-go that referenced this pull request Feb 18, 2024
* feat: ErrQueryInterrupted with parameters

Signed-off-by: ekexium <eke@fastmail.com>

* Revert "Revert "fix: check kill signal against 0 (tikv#1102)" (tikv#1129)"

This reverts commit 3480b5e.

Signed-off-by: ekexium <eke@fastmail.com>

---------

Signed-off-by: ekexium <eke@fastmail.com>
Co-authored-by: cfzjywxk <lsswxrxr@163.com>
cfzjywxk added a commit that referenced this pull request Feb 19, 2024
* feat: check kill signal in 2pc committer (#1084)

Signed-off-by: ekexium <eke@fastmail.com>
Co-authored-by: disksing <i@disksing.com>

* ErrQueryInterrupted with parameters (#1124)

* feat: ErrQueryInterrupted with parameters

Signed-off-by: ekexium <eke@fastmail.com>

* Revert "Revert "fix: check kill signal against 0 (#1102)" (#1129)"

This reverts commit 3480b5e.

Signed-off-by: ekexium <eke@fastmail.com>

---------

Signed-off-by: ekexium <eke@fastmail.com>
Co-authored-by: cfzjywxk <lsswxrxr@163.com>

---------

Signed-off-by: ekexium <eke@fastmail.com>
Co-authored-by: disksing <i@disksing.com>
Co-authored-by: cfzjywxk <lsswxrxr@163.com>
@ti-chi-bot ti-chi-bot added needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. and removed needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. labels Feb 26, 2024
ekexium added a commit to ekexium/client-go that referenced this pull request Feb 27, 2024
* feat: ErrQueryInterrupted with parameters

Signed-off-by: ekexium <eke@fastmail.com>

* Revert "Revert "fix: check kill signal against 0 (tikv#1102)" (tikv#1129)"

This reverts commit 3480b5e.

Signed-off-by: ekexium <eke@fastmail.com>

---------

Signed-off-by: ekexium <eke@fastmail.com>
Co-authored-by: cfzjywxk <lsswxrxr@163.com>
@ti-chi-bot ti-chi-bot added the needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. label Feb 27, 2024
ekexium added a commit that referenced this pull request Feb 27, 2024
* fix: check kill signal against 0 (#1102)

* fix: check kill signal against 0, so that all kill signals will not be ignored.

Signed-off-by: ekexium <eke@fastmail.com>

* refactor: extract method checkKilled()

Signed-off-by: ekexium <eke@fastmail.com>

---------

Signed-off-by: ekexium <eke@fastmail.com>
Co-authored-by: cfzjywxk <lsswxrxr@163.com>

* ErrQueryInterrupted with parameters (#1124)

* feat: ErrQueryInterrupted with parameters

Signed-off-by: ekexium <eke@fastmail.com>

* Revert "Revert "fix: check kill signal against 0 (#1102)" (#1129)"

This reverts commit 3480b5e.

Signed-off-by: ekexium <eke@fastmail.com>

---------

Signed-off-by: ekexium <eke@fastmail.com>
Co-authored-by: cfzjywxk <lsswxrxr@163.com>

* rm backoff.go

Signed-off-by: ekexium <eke@fastmail.com>

---------

Signed-off-by: ekexium <eke@fastmail.com>
Co-authored-by: cfzjywxk <lsswxrxr@163.com>
zeminzhou pushed a commit to zeminzhou/client-go that referenced this pull request Feb 28, 2024
* feat: check kill signal in 2pc committer (tikv#1084)

Signed-off-by: ekexium <eke@fastmail.com>
Co-authored-by: disksing <i@disksing.com>

* ErrQueryInterrupted with parameters (tikv#1124)

* feat: ErrQueryInterrupted with parameters

Signed-off-by: ekexium <eke@fastmail.com>

* Revert "Revert "fix: check kill signal against 0 (tikv#1102)" (tikv#1129)"

This reverts commit 3480b5e.

Signed-off-by: ekexium <eke@fastmail.com>

---------

Signed-off-by: ekexium <eke@fastmail.com>
Co-authored-by: cfzjywxk <lsswxrxr@163.com>

---------

Signed-off-by: ekexium <eke@fastmail.com>
Co-authored-by: disksing <i@disksing.com>
Co-authored-by: cfzjywxk <lsswxrxr@163.com>
zeminzhou pushed a commit to zeminzhou/client-go that referenced this pull request Feb 28, 2024
* feat: check kill signal in 2pc committer (tikv#1084)

Signed-off-by: ekexium <eke@fastmail.com>
Co-authored-by: disksing <i@disksing.com>

* ErrQueryInterrupted with parameters (tikv#1124)

* feat: ErrQueryInterrupted with parameters

Signed-off-by: ekexium <eke@fastmail.com>

* Revert "Revert "fix: check kill signal against 0 (tikv#1102)" (tikv#1129)"

This reverts commit 3480b5e.

Signed-off-by: ekexium <eke@fastmail.com>

---------

Signed-off-by: ekexium <eke@fastmail.com>
Co-authored-by: cfzjywxk <lsswxrxr@163.com>

---------

Signed-off-by: ekexium <eke@fastmail.com>
Co-authored-by: disksing <i@disksing.com>
Co-authored-by: cfzjywxk <lsswxrxr@163.com>
zeminzhou pushed a commit to zeminzhou/client-go that referenced this pull request Feb 28, 2024
* feat: check kill signal in 2pc committer (tikv#1084)

Signed-off-by: ekexium <eke@fastmail.com>
Co-authored-by: disksing <i@disksing.com>

* ErrQueryInterrupted with parameters (tikv#1124)

* feat: ErrQueryInterrupted with parameters

Signed-off-by: ekexium <eke@fastmail.com>

* Revert "Revert "fix: check kill signal against 0 (tikv#1102)" (tikv#1129)"

This reverts commit 3480b5e.

Signed-off-by: ekexium <eke@fastmail.com>

---------

Signed-off-by: ekexium <eke@fastmail.com>
Co-authored-by: cfzjywxk <lsswxrxr@163.com>

---------

Signed-off-by: ekexium <eke@fastmail.com>
Co-authored-by: disksing <i@disksing.com>
Co-authored-by: cfzjywxk <lsswxrxr@163.com>
Signed-off-by: zzm <zhouzemin@pingcap.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants