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, parser: fix the DDL job version using issue #47915

Merged
merged 1 commit into from
Oct 23, 2023

Conversation

zimulala
Copy link
Contributor

@zimulala zimulala commented Oct 23, 2023

What problem does this PR solve?

Issue Number: close #47912 (Fix this issue on master), close #46306 (Fix this issue on v7.5)

Problem Summary:
After #3993, we using job.Version like

	if job.Version <= currentVersion {
		err = w.delRangeManager.addDelRangeJob(ctx, job)
	} else {
		err = dbterror.ErrInvalidDDLJobVersion.GenWithStackByArgs(job.Version, currentVersion)
	}

So, when we add the currentVersion value(#47818) and have two versions TiDB has an issue.

What is changed and how it works?

Use ReorgMeta's version instead of Job's.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
    • Case 1
      deploy v7.1.0 cluster with 2 tidb.
      Then upgrade this cluster to master one by one.
      Result: After this PR, upgrade successfully.

    • Case 2(Manual test in pkg/ddl: fix an issue where endkey usage issues caused index loss (#47818) #47884 )
      deploy v7.1.1+ cluster with 1 tidb
      set @@global.tidb_ddl_enable_fast_reorg = 0;
      Create a table and import 3.5 million rows.
      Do alter table t add index idx(a, b);, and when it backfills 700,000+ indexes, kill the cluster.
      Then upgrade this cluster to master.
      After upgrading successfully, do admin check index t idx
      Result: we get Query OK.

  • 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. do-not-merge/needs-triage-completed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 23, 2023
@tiprow
Copy link

tiprow bot commented Oct 23, 2023

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

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.

@codecov
Copy link

codecov bot commented Oct 23, 2023

Codecov Report

Merging #47915 (8d12886) into master (98b6c43) will increase coverage by 1.5687%.
Report is 6 commits behind head on master.
The diff coverage is 100.0000%.

Additional details and impacted files
@@               Coverage Diff                @@
##             master     #47915        +/-   ##
================================================
+ Coverage   71.7443%   73.3131%   +1.5687%     
================================================
  Files          1399       1424        +25     
  Lines        405476     416429     +10953     
================================================
+ Hits         290906     305297     +14391     
+ Misses        94846      92130      -2716     
+ Partials      19724      19002       -722     
Flag Coverage Δ
integration 42.5786% <20.0000%> (?)
unit 72.2823% <100.0000%> (+0.5380%) ⬆️

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

Components Coverage Δ
dumpling 53.9913% <ø> (ø)
parser ∅ <ø> (∅)
br 48.9836% <ø> (-3.9906%) ⬇️

@ti-chi-bot ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. do-not-merge/needs-triage-completed labels Oct 23, 2023
@pingcap pingcap deleted a comment from ti-chi-bot bot Oct 23, 2023
@ti-chi-bot ti-chi-bot bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 23, 2023
@pingcap pingcap deleted a comment from ti-chi-bot bot Oct 23, 2023
@ti-chi-bot ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Oct 23, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Oct 23, 2023

[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

Needs approval from an approver in each of these files:
  • OWNERS [tangenta,wjhuang2016]

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 Oct 23, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Oct 23, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-10-23 07:28:04.294436038 +0000 UTC m=+2246881.881546184: ☑️ agreed by tangenta.
  • 2023-10-23 09:55:50.785017051 +0000 UTC m=+2255748.372127197: ☑️ agreed by wjhuang2016.

@zimulala zimulala added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Oct 23, 2023
@zimulala
Copy link
Contributor Author

/test check-dev2

1 similar comment
@zimulala
Copy link
Contributor Author

/test check-dev2

@tiprow
Copy link

tiprow bot commented Oct 23, 2023

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

In response to this:

/test check-dev2

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.

@pingcap pingcap deleted a comment from ti-chi-bot bot Oct 23, 2023
@pingcap pingcap deleted a comment from tiprow bot Oct 23, 2023
@ti-chi-bot ti-chi-bot bot merged commit c193d8a into pingcap:master Oct 23, 2023
14 of 16 checks passed
@zimulala zimulala deleted the zimuxia/fix-version branch October 23, 2023 13:12
@zimulala zimulala added the needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. label Oct 23, 2023
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Oct 23, 2023
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot bot pushed a commit that referenced this pull request Oct 25, 2023
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
4 participants