Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ddl: we shouldn't make a DDL job to a dist task when it's on system DB in upgrading #48716

Merged
merged 3 commits into from
Nov 20, 2023

Conversation

zimulala
Copy link
Contributor

@zimulala zimulala commented Nov 20, 2023

What problem does this PR solve?

Issue Number: close #48706

Problem Summary:

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
    Ran IT as described in the issue
  • 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 bot added do-not-merge/needs-tests-checked release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/needs-triage-completed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 20, 2023
Copy link

codecov bot commented Nov 20, 2023

Codecov Report

Merging #48716 (8fcb8be) into master (20e72af) will increase coverage by 1.6274%.
Report is 6 commits behind head on master.
The diff coverage is 40.0000%.

Additional details and impacted files
@@               Coverage Diff                @@
##             master     #48716        +/-   ##
================================================
+ Coverage   71.0934%   72.7209%   +1.6274%     
================================================
  Files          1364       1388        +24     
  Lines        404158     411070      +6912     
================================================
+ Hits         287330     298934     +11604     
+ Misses        96873      93246      -3627     
+ Partials      19955      18890      -1065     
Flag Coverage Δ
integration 43.5767% <0.0000%> (?)
unit 71.1505% <40.0000%> (+0.0570%) ⬆️

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

Components Coverage Δ
dumpling 53.9874% <ø> (ø)
parser ∅ <ø> (∅)
br 48.8008% <ø> (-4.2899%) ⬇️

@ti-chi-bot ti-chi-bot bot added needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. and removed do-not-merge/needs-triage-completed labels Nov 20, 2023
@pingcap pingcap deleted a comment from ti-chi-bot bot Nov 20, 2023
@pingcap pingcap deleted a comment from tiprow bot Nov 20, 2023
@ti-chi-bot ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Nov 20, 2023
pkg/ddl/index.go Outdated
}
if variable.EnableDistTask.Load() {
isDistReorg := false
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe useDistReorg is better to understand?

pkg/ddl/index.go Outdated
} else {
_, err = ingest.LitBackCtxMgr.Register(ctx, unique, job.ID, nil, pdLeaderAddr, job.ReorgMeta.ResourceGroupName)
if isUpgradingSysDB {
logutil.BgLogger().Info("pick backfill type, handle the job on the system DB in upgrading state",
Copy link
Contributor

Choose a reason for hiding this comment

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

The log is harder to understand. :(

@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Nov 20, 2023
Copy link

ti-chi-bot bot commented Nov 20, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-11-20 09:16:03.72411485 +0000 UTC m=+222992.389341045: ☑️ agreed by ywqzzy.
  • 2023-11-20 09:30:20.761900337 +0000 UTC m=+223849.427126543: ☑️ agreed by Defined2014.

Copy link

ti-chi-bot bot commented Nov 20, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Defined2014, tangenta, ywqzzy

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

@zimulala
Copy link
Contributor Author

/test unit-test

Copy link

tiprow bot commented Nov 20, 2023

@zimulala: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/test unit-test

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/test-infra repository.

@ti-chi-bot ti-chi-bot bot merged commit d84e1d2 into pingcap:master Nov 20, 2023
16 checks passed
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.5: #48726.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

upgrade maybe blocked when enable tidb_enale_dist_task
5 participants