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

feat: check kill signal in 2pc committer #1084

Merged
merged 3 commits into from
Dec 26, 2023

Conversation

ekexium
Copy link
Contributor

@ekexium ekexium commented Dec 21, 2023

@ekexium ekexium force-pushed the check-kill-signal-in-committer branch 4 times, most recently from 3ab3d54 to 797efcb Compare December 21, 2023 07:37
Signed-off-by: ekexium <eke@fastmail.com>
@ekexium ekexium force-pushed the check-kill-signal-in-committer branch from 797efcb to 18bd3d1 Compare December 21, 2023 07:58
// ErrTiKVStaleCommand is the error that the command is stale in tikv.
ErrTiKVStaleCommand = errors.New("tikv stale command")
// ErrTiKVMaxTimestampNotSynced is the error that tikv's max timestamp is not synced.
ErrTiKVMaxTimestampNotSynced = errors.New("tikv max timestamp not synced")
// ErrLockAcquireFailAndNoWaitSet is the error that acquire the lock failed while no wait is setted.
ErrLockAcquireFailAndNoWaitSet = errors.New("lock acquired failed and no wait is setted")
ErrLockAcquireFailAndNoWaitSet = errors.New("lock acquired failed and no wait is set")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😆

txnkv/transaction/2pc.go Outdated Show resolved Hide resolved
Signed-off-by: ekexium <eke@fastmail.com>
@ekexium ekexium force-pushed the check-kill-signal-in-committer branch from 55ce5be to bdd38fa Compare December 26, 2023 04:26
@disksing disksing merged commit 2ea84a6 into tikv:master Dec 26, 2023
10 checks passed
@ekexium ekexium deleted the check-kill-signal-in-committer branch January 3, 2024 04:09
@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
Signed-off-by: ekexium <eke@fastmail.com>
Co-authored-by: disksing <i@disksing.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
@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
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.

3 participants