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

fix: check kill signal against 0 #1102

Merged
merged 4 commits into from
Jan 10, 2024

Conversation

ekexium
Copy link
Contributor

@ekexium ekexium commented Jan 3, 2024

Previously the kill signal was checked against 1, however TiDB uses non-zero values to indicate a kill signal.

…e ignored.

Signed-off-by: ekexium <eke@fastmail.com>
@ekexium ekexium force-pushed the check-kill-signal-in-committer-2 branch from c0e822d to 3521491 Compare January 3, 2024 08:17
@ekexium
Copy link
Contributor Author

ekexium commented Jan 3, 2024

Why are there two identical backoff.go ? I just noticed this😓 @disksing any idea?

config/retry/backoff.go Outdated Show resolved Hide resolved
@ekexium ekexium force-pushed the check-kill-signal-in-committer-2 branch from d2141b3 to 15d27cb Compare January 5, 2024 03:18
Signed-off-by: ekexium <eke@fastmail.com>
@ekexium ekexium force-pushed the check-kill-signal-in-committer-2 branch from 15d27cb to 83c820b Compare January 5, 2024 03:19
@zyguan
Copy link
Contributor

zyguan commented Jan 5, 2024

Why are there two identical backoff.go ? I just noticed this😓 @disksing any idea?

I guess the internal/client/retry is redundant and can be removed.

@cfzjywxk
Copy link
Contributor

cfzjywxk commented Jan 5, 2024

@ekexium Please update the branch

@cfzjywxk cfzjywxk merged commit 057c479 into tikv:master Jan 10, 2024
10 checks passed
MyonKeminta added a commit to MyonKeminta/client-go that referenced this pull request Jan 23, 2024
MyonKeminta added a commit to MyonKeminta/client-go that referenced this pull request Jan 23, 2024
This reverts commit 057c479.

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
MyonKeminta added a commit that referenced this pull request Jan 23, 2024
This reverts commit 057c479.

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
Co-authored-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
ekexium added a commit to ekexium/client-go that referenced this pull request Jan 29, 2024
)"

This reverts commit 3480b5e.

Signed-off-by: ekexium <eke@fastmail.com>
cfzjywxk added a commit that referenced this pull request Feb 2, 2024
* 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>
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>
ekexium added a commit to ekexium/client-go that referenced this pull request Feb 27, 2024
* 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>
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>
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>
iosmanthus pushed a commit that referenced this pull request Mar 13, 2024
Co-authored-by: zzm <zhouzemin@pingcap.com>
Co-authored-by: glorv <glorvs@163.com>
Co-authored-by: disksing <i@disksing.com>
Co-authored-by: cfzjywxk <lsswxrxr@163.com>
Co-authored-by: ShuNing <nolouch@gmail.com>
Co-authored-by: ekexium <eke@fastmail.com>
Co-authored-by: Yongbo Jiang <cabinfeveroier@gmail.com>
Co-authored-by: David <8039876+AmoebaProtozoa@users.noreply.github.com>
Co-authored-by: Evan Zhou <coocood@gmail.com>
Co-authored-by: iosmanthus <dengliming@pingcap.com>
Co-authored-by: Ryan Leung <rleungx@gmail.com>
Co-authored-by: jinhelin <linjinhe33@gmail.com>
Co-authored-by: iosmanthus <myosmanthustree@gmail.com>
Co-authored-by: Ping Yu <yuping@pingcap.com>
fix: check kill signal against 0 (#1102)" (#1129)"
fix safepoint kv with keyspace name (#928)
fix encoding of mvcc get by key (#775)
close on canceled (#1121)
Fix wait recvloop timeout (#1134)
CloseAddr (#1140)
Fix timeout of TestResolveTxnFallbackFromAsyncCommit (#1146)
iosmanthus added a commit that referenced this pull request Jul 9, 2024
Co-authored-by: zzm <zhouzemin@pingcap.com>
Co-authored-by: glorv <glorvs@163.com>
Co-authored-by: disksing <i@disksing.com>
Co-authored-by: cfzjywxk <lsswxrxr@163.com>
Co-authored-by: ShuNing <nolouch@gmail.com>
Co-authored-by: ekexium <eke@fastmail.com>
Co-authored-by: Liqi Geng <gengliqiii@gmail.com>
Co-authored-by: zyguan <zhongyangguan@gmail.com>
Co-authored-by: xufei <xufeixw@mail.ustc.edu.cn>
Co-authored-by: crazycs <crazycs520@gmail.com>
fix: check kill signal against 0 (#1102)" (#1129)"
fix #1111 (#1324)
fix rpc client panic cause by concurrent close (#1358)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants