Skip to content

ddl: optimize temp index worker in highly conflicting case (#61445)#62492

Merged
ti-chi-bot[bot] merged 4 commits into
pingcap:release-8.5from
ti-chi-bot:cherry-pick-61445-to-release-8.5
Jul 21, 2025
Merged

ddl: optimize temp index worker in highly conflicting case (#61445)#62492
ti-chi-bot[bot] merged 4 commits into
pingcap:release-8.5from
ti-chi-bot:cherry-pick-61445-to-release-8.5

Conversation

@ti-chi-bot
Copy link
Copy Markdown
Member

This is an automated cherry-pick of #61445

What problem does this PR solve?

Issue Number: close #61433

Problem Summary:

When there are lots of conflicts between DDL internal txn and DML txn, temp index worker can hardly make any progress.

What changed and how does it work?

  • Remove the LockKeys in DDL internal txn from merge index worker.
    • if both DDL txn and DML txn modify the same index key, there will be a conflict and DDL txn will retry. (after #62387)
    • if DDL txn modifies the index key, DML txn only modifies the row key, there will be no conflict anymore (this is the key improvement).
  • Delete temp index records after applying them to the original index to eliminate reentrant cost.
  • Reduce the batch count of DDL txn when suffering frequent conflicts.
  • Add metrics to monitor the progress of merging temp index:
    • tidb_ddl_temp_index_write: the counter of writing to temp index (single write).
    • tidb_ddl_temp_index_double_write: the counter of writing to temp index (double write).
    • tidb_ddl_temp_index_scan: the counter of scanned temp index value records.
    • tidb_ddl_temp_index_merge: the counter of merged temp index value records.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test
    • I checked and no code files have been changed.

Side effects

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

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

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. release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR. labels Jul 18, 2025
@ti-chi-bot
Copy link
Copy Markdown
Member Author

@tangenta 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
Copy link
Copy Markdown

ti-chi-bot Bot commented Jul 18, 2025

@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.

Copy link
Copy Markdown
Collaborator

@Benjamin2037 Benjamin2037 left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot ti-chi-bot Bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Jul 18, 2025
@ti-chi-bot
Copy link
Copy Markdown

ti-chi-bot Bot commented Jul 18, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Benjamin2037, fzzf678

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 Jul 18, 2025
@ti-chi-bot
Copy link
Copy Markdown

ti-chi-bot Bot commented Jul 18, 2025

[LGTM Timeline notifier]

Timeline:

  • 2025-07-18 04:18:50.041871527 +0000 UTC m=+2837382.765050512: ☑️ agreed by Benjamin2037.
  • 2025-07-18 04:21:48.630058555 +0000 UTC m=+2837561.353237536: ☑️ agreed by fzzf678.

Signed-off-by: tangenta <tangenta@126.com>
@codecov
Copy link
Copy Markdown

codecov Bot commented Jul 18, 2025

Codecov Report

❌ Patch coverage is 70.77465% with 83 lines in your changes missing coverage. Please review.
⚠️ Please upload report for BASE (release-8.5@43592e8). Learn more about missing BASE report.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-8.5     #62492   +/-   ##
================================================
  Coverage               ?   57.7065%           
================================================
  Files                  ?       1780           
  Lines                  ?     631428           
  Branches               ?          0           
================================================
  Hits                   ?     364375           
  Misses                 ?     242504           
  Partials               ?      24549           
Flag Coverage Δ
integration 38.2606% <68.6619%> (?)
unit 72.7836% <65.8450%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
dumpling 52.9278% <0.0000%> (?)
parser ∅ <0.0000%> (?)
br 63.3837% <0.0000%> (?)
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@Benjamin2037
Copy link
Copy Markdown
Collaborator

/retest

@Benjamin2037
Copy link
Copy Markdown
Collaborator

/unhold

@ti-chi-bot ti-chi-bot Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 18, 2025
@Benjamin2037
Copy link
Copy Markdown
Collaborator

/retest

1 similar comment
@fzzf678
Copy link
Copy Markdown
Contributor

fzzf678 commented Jul 18, 2025

/retest

@ti-chi-bot ti-chi-bot Bot added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Jul 18, 2025
@hawkingrei
Copy link
Copy Markdown
Member

/retest

Signed-off-by: tangenta <tangenta@126.com>
@Benjamin2037
Copy link
Copy Markdown
Collaborator

/retest

Signed-off-by: tangenta <tangenta@126.com>
@ti-chi-bot ti-chi-bot Bot merged commit dcbfb10 into pingcap:release-8.5 Jul 21, 2025
20 checks passed
@ti-chi-bot ti-chi-bot Bot added cherry-pick-approved Cherry pick PR approved by release team. and removed cherry-pick-approved Cherry pick PR approved by release team. labels Jul 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved cherry-pick-approved Cherry pick PR approved by release team. lgtm release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants