Skip to content

concurrency-manager: do not assert in concurrency manager#18329

Merged
ti-chi-bot[bot] merged 1 commit intotikv:masterfrom
ekexium:do-not-assert-in-cm
Mar 21, 2025
Merged

concurrency-manager: do not assert in concurrency manager#18329
ti-chi-bot[bot] merged 1 commit intotikv:masterfrom
ekexium:do-not-assert-in-cm

Conversation

@ekexium
Copy link
Contributor

@ekexium ekexium commented Mar 20, 2025

What is changed and how it works?

Issue Number: ref #17916

What's Changed:

Do not assert in concurrency manager. 

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Release note

None

Signed-off-by: ekexium <eke@fastmail.com>
@ti-chi-bot ti-chi-bot bot added release-note-none Denotes a PR that doesn't merit a release note. dco-signoff: yes Indicates the PR's author has signed the dco. needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 20, 2025
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Mar 21, 2025
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Mar 21, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cfzjywxk, zyguan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Mar 21, 2025
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Mar 21, 2025

[LGTM Timeline notifier]

Timeline:

  • 2025-03-21 05:54:32.65909598 +0000 UTC m=+594166.343332077: ☑️ agreed by zyguan.
  • 2025-03-21 06:39:13.29686854 +0000 UTC m=+596846.981104636: ☑️ agreed by cfzjywxk.

@ti-chi-bot ti-chi-bot bot merged commit 472f2aa into tikv:master Mar 21, 2025
8 checks passed
@ti-chi-bot ti-chi-bot bot added this to the Pool milestone Mar 21, 2025
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.1: #18331.
But this PR has conflicts, please resolve them!

ti-chi-bot pushed a commit to ti-chi-bot/tikv that referenced this pull request Mar 21, 2025
ref tikv#17916

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-8.1: #18332.
But this PR has conflicts, please resolve them!

ti-chi-bot pushed a commit to ti-chi-bot/tikv that referenced this pull request Mar 21, 2025
ref tikv#17916

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
bufferflies pushed a commit to bufferflies/tikv that referenced this pull request Sep 19, 2025
* concurrency_manager: check update_max_ts against a limit (tikv#17917)

close tikv#17916

concurrency_manager: add safety boundary for max_ts updates

Add `max_ts_limit` to prevent unreasonable timestamp updates. The limit is
synchronized with PD timestamp periodically. Configure via max_ts_allowance_secs
 and max_ts_sync_interval_secs.

Updates from PD bypass this limit.

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

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
Signed-off-by: ekexium <eke@fastmail.com>

* concurrency_manager: double check via PD TSO before reporting error of invalid max-ts update (tikv#18057)

close tikv#18055

concurrency_manager: double check via PD TSO before reporting error of invalid max-ts update

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

* concurrency_manager: make max-ts checker more robust (tikv#18080)

ref tikv#18055

When validating max-ts updates, do not report error or panic unless confirmed by PD TSO.
This reduces both false positive and false negative cases.

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

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
Signed-off-by: ekexium <eke@fastmail.com>

* config: rename config items for max-ts checker (tikv#18118)

ref tikv#17916

config: rename config items for max-ts checker

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

* concurrency-manager: do not assert in concurrency manager (tikv#18329)

ref tikv#17916

Do not assert in concurrency manager.

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

* delete unexpected files from cherry-picking

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

---------

Signed-off-by: ekexium <eke@fastmail.com>
Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved dco-signoff: yes Indicates the PR's author has signed the dco. lgtm needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants