Skip to content

upgrade: fix upgrade failed on nextgen#63569

Merged
ti-chi-bot[bot] merged 1 commit into
pingcap:masterfrom
D3Hunter:fix-upgrade-nextgen
Sep 17, 2025
Merged

upgrade: fix upgrade failed on nextgen#63569
ti-chi-bot[bot] merged 1 commit into
pingcap:masterfrom
D3Hunter:fix-upgrade-nextgen

Conversation

@D3Hunter

Copy link
Copy Markdown
Contributor

What problem does this PR solve?

Issue Number: ref #61702

Problem Summary:
after #63524, nextgen will have the need to upgrade, and at that time we have merged the pr to cal resource params for reorg related ddl. for modify column, we actually don't need to cal the param, but we will get the table size as the first step, so will fail

What changed and how does it work?

during init for reorg params, we auto calculate resource related params for nextgen, but during upgrade, DXF service hasn't initialized, and we shouldn't use DXF service to run boot related DDL

Check List

Tests

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

bootstrap nextgen cluster before hash 365cc25, then upgrade to master, it will fail with

[2025/09/17 17:16:11.404 +08:00] [FATAL] [upgrade.go:733] ["doReentrantDDL error"] [keyspaceName=SYSTEM] [error="task manager is not initialized"] 

if we upgrade to this PR, it will success

  • 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 Bot added release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 17, 2025
@tiprow

tiprow Bot commented Sep 17, 2025

Copy link
Copy Markdown

Hi @D3Hunter. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

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 kubernetes-sigs/prow repository.

@ti-chi-bot ti-chi-bot Bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Sep 17, 2025
@ti-chi-bot

ti-chi-bot Bot commented Sep 17, 2025

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tangenta, wjhuang2016

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 Sep 17, 2025
@ti-chi-bot

ti-chi-bot Bot commented Sep 17, 2025

Copy link
Copy Markdown

[LGTM Timeline notifier]

Timeline:

  • 2025-09-17 09:34:05.939921587 +0000 UTC m=+6007.418502233: ☑️ agreed by tangenta.
  • 2025-09-17 09:46:48.963198912 +0000 UTC m=+6770.441779559: ☑️ agreed by wjhuang2016.

@codecov

codecov Bot commented Sep 17, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 57.14286% with 3 lines in your changes missing coverage. Please review.
✅ Project coverage is 74.7551%. Comparing base (35094ab) to head (deb9cbe).
⚠️ Report is 1 commits behind head on master.

Additional details and impacted files
@@               Coverage Diff                @@
##             master     #63569        +/-   ##
================================================
+ Coverage   72.8126%   74.7551%   +1.9425%     
================================================
  Files          1840       1886        +46     
  Lines        497488     505696      +8208     
================================================
+ Hits         362234     378034     +15800     
+ Misses       113271     104220      -9051     
- Partials      21983      23442      +1459     
Flag Coverage Δ
integration 48.4825% <57.1428%> (?)
unit 72.3713% <57.1428%> (+0.0142%) ⬆️

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

Components Coverage Δ
dumpling 52.8700% <ø> (ø)
parser ∅ <ø> (∅)
br 63.0827% <ø> (+16.5628%) ⬆️
🚀 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 merged commit d0f3079 into pingcap:master Sep 17, 2025
31 checks passed
@D3Hunter D3Hunter deleted the fix-upgrade-nextgen branch September 17, 2025 10:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved lgtm release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants