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) #47936

Merged

Conversation

ti-chi-bot
Copy link
Member

@ti-chi-bot ti-chi-bot commented Oct 23, 2023

This is an automated cherry-pick of #47915

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

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added 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. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR. labels Oct 23, 2023
@pingcap pingcap deleted a comment from ti-chi-bot bot Oct 23, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Oct 23, 2023
@zimulala zimulala requested review from tangenta and wjhuang2016 and removed request for tangenta October 23, 2023 13:30
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Oct 24, 2023
@zimulala
Copy link
Contributor

/retest-required

@ti-chi-bot
Copy link

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

ti-chi-bot bot commented Oct 25, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-10-24 02:06:19.304113862 +0000 UTC m=+2313976.891223991: ☑️ agreed by tangenta.
  • 2023-10-25 04:18:42.369123738 +0000 UTC m=+2408319.956233883: ☑️ agreed by wjhuang2016.

@ti-chi-bot ti-chi-bot bot merged commit c914b34 into pingcap:release-7.5 Oct 25, 2023
7 checks passed
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/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants