Skip to content

maintainer: make dispatcher operator admission atomic (#6070) - #6085

Open
ti-chi-bot wants to merge 1 commit into
pingcap:release-nextgen-202603from
ti-chi-bot:cherry-pick-6070-to-release-nextgen-202603
Open

maintainer: make dispatcher operator admission atomic (#6070)#6085
ti-chi-bot wants to merge 1 commit into
pingcap:release-nextgen-202603from
ti-chi-bot:cherry-pick-6070-to-release-nextgen-202603

Conversation

@ti-chi-bot

Copy link
Copy Markdown
Member

This is an automated cherry-pick of #6070

What problem does this PR solve?

Issue Number: close #6069

What is changed and how it works?

This change prevents multiple operators for the same dispatcher from being admitted concurrently.

Previously, AddOperator checked whether an operator already existed under a read lock, released the lock, and registered the new operator later under a write lock. Two concurrent operations, such as an Add and a Move for the same dispatcher, could both pass the initial check. Both operators would then be started and placed in the running queue, even though one overwrote the other in the operator map. This could create the same dispatcher on different TiCDC nodes.

An empty-origin Move is still allowed. If an Add and an empty-origin Move race for the same dispatcher, atomic admission ensures that only one can win. If the Move wins, it proceeds to create the dispatcher only on its destination node.

The barrier handling path is also hardened to accept a dispatcher’s block status only when the reporting node is the dispatcher’s current owner. Statuses from stale or non-owner dispatcher instances are ignored, preventing them from advancing a DDL or sync-point barrier.

Now the stale merge rollback will no longer mistakenly cancel a later installed remove operator.

Check List

Tests

  • Unit test
  • Integration test

Questions

Will it cause performance regression or break compatibility?
Do you need to update user documentation, design documentation or monitoring documentation?

Release note

Fix a race condition that could create duplicate dispatchers and cause downstream data inconsistency.

Summary by CodeRabbit

Bug Fixes

  • Block status updates from non-owner nodes are now safely ignored.
  • Unknown dispatchers and invalid statuses no longer trigger barrier processing.
  • Operator registration now safely rejects concurrent duplicate requests.
  • Replica moves are supported when the original node is unspecified.
  • Operator replacement is now serialized with normal admission, preventing conflicting operations.
  • Stale rollback actions can no longer cancel a newer replacement operator.

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. type/cherry-pick-for-release-nextgen-202603 labels Aug 25, 2026
@ti-chi-bot

ti-chi-bot Bot commented Aug 25, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign asddongmen for approval. For more information see the Code Review Process.
Please ensure that each of them provides their approval before proceeding.

The full list of commands accepted by this bot can be found 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

Copy link
Copy Markdown
Member Author

@wk989898 This PR has conflicts, I have hold it.
Please resolve them or ask others to resolve them, then comment /unhold to remove the hold label.

@ti-chi-bot

ti-chi-bot Bot commented Aug 25, 2026

Copy link
Copy Markdown

@ti-chi-bot: ## If you want to know how to resolve it, please read the guide in TiDB Dev Guide.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot Bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Aug 25, 2026
@coderabbitai

coderabbitai Bot commented Aug 25, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: e8cfa243-1931-47c0-b3b0-13fd66f4b0df

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. type/cherry-pick-for-release-nextgen-202603

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants