Skip to content

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #63605

What problem does this PR solve?

Issue Number: close #63201

Problem Summary:
After #60828, the runReorgJob will return periodically, this means every time we enter the runOneJobStep, the Job is a new job, not the one pass to backfill worker, so the config in the initial Job can't be updated.

tidb/pkg/ddl/job_worker.go

Lines 898 to 900 in b3011b6

job.ReorgMeta.SetConcurrency(latestJob.ReorgMeta.GetConcurrency())
job.ReorgMeta.SetBatchSize(latestJob.ReorgMeta.GetBatchSize())
job.ReorgMeta.SetMaxWriteSpeed(latestJob.ReorgMeta.GetMaxWriteSpeed())

What changed and how does it work?

Update config from system table in the adjust config loop.

Check List

Tests

  • Unit test
  • Integration test
    After this pr, use admin alter ddl jobs can adjust thread batch_size and max_write_speed normally
截屏2025-09-22 16 23 55
  • 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

@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/L Denotes a PR that changes 100-499 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 Sep 22, 2025
@ti-chi-bot
Copy link
Member Author

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

Copy link

ti-chi-bot bot commented Sep 22, 2025

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

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.

@fzzf678
Copy link
Contributor

fzzf678 commented Sep 22, 2025

/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 Sep 22, 2025
Copy link

codecov bot commented Sep 22, 2025

Codecov Report

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

Additional details and impacted files
@@               Coverage Diff                @@
##             release-8.5     #63674   +/-   ##
================================================
  Coverage               ?   57.8057%           
================================================
  Files                  ?       1783           
  Lines                  ?     632937           
  Branches               ?          0           
================================================
  Hits                   ?     365874           
  Misses                 ?     242341           
  Partials               ?      24722           
Flag Coverage Δ
integration 38.2512% <73.3333%> (?)
unit 72.8077% <40.0000%> (?)

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.2263% <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.

@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Sep 23, 2025
Copy link
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

Copy link

ti-chi-bot bot commented Sep 23, 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

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 approved lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Sep 23, 2025
Copy link

ti-chi-bot bot commented Sep 23, 2025

[LGTM Timeline notifier]

Timeline:

  • 2025-09-23 01:07:13.186451639 +0000 UTC m=+318843.256945321: ☑️ agreed by fzzf678.
  • 2025-09-23 01:35:48.570144093 +0000 UTC m=+320558.640637774: ☑️ agreed by Benjamin2037.

@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 Sep 23, 2025
@ti-chi-bot ti-chi-bot bot merged commit ca1a5ba into pingcap:release-8.5 Sep 23, 2025
20 checks passed
@ti-chi-bot ti-chi-bot bot deleted the cherry-pick-63605-to-release-8.5 branch September 23, 2025 05:57
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/L Denotes a PR that changes 100-499 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.

3 participants