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, session: fix re-upgrade issues (#44469) #44582

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #44469

What problem does this PR solve?

Issue Number: close #44158, and related #44366

Problem Summary:
Mock: do upgradeNewVer: Add a new mysql.table(mock system DDL)

case 1

  1. The new TiDB upgrade failed(such as TiKV network problems), and the mock system DDL is queuing
  2. Re-upgrade the TiDB(This operation will pause all DDL jobs by the system). It will pause the mock system DDL which always goes into runDDLJob.

case 2

  1. The new TiDB upgrade failed(such as TiKV network problems), and the etcd owner path isn't remove
  2. The etcd owner path TTL is 60s, we retry get owner info is 2s. So we can't get the owner's info normally.

What is changed and how it works?

  • Make all paused DDL jobs can't be runnable(won't go into runDDLJob) when upgrading state.
  • Extend the timeout to get owner's info.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
    case 2.
  • No code

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 requested a review from a team as a code owner June 12, 2023 08:11
@ti-chi-bot ti-chi-bot added 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-7.1 This PR is cherry-picked to release-7.1 from a source PR. labels Jun 12, 2023
@ti-chi-bot ti-chi-bot bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/cherry-pick-not-approved labels Jun 12, 2023
@ti-chi-bot ti-chi-bot bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 12, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Jul 7, 2023
@ti-chi-bot ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jul 12, 2023
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jul 12, 2023
@ti-chi-bot ti-chi-bot bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 12, 2023
@pingcap pingcap deleted a comment from ti-chi-bot bot Jul 12, 2023
@ti-chi-bot ti-chi-bot bot added the lgtm label Jul 12, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Jul 12, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Defined2014, XuHuaiyu

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 [Defined2014,XuHuaiyu]

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 removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Jul 12, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Jul 12, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-07-12 06:58:59.988428445 +0000 UTC m=+488031.758767158: ☑️ agreed by Defined2014.
  • 2023-07-12 09:23:31.781441797 +0000 UTC m=+496703.551780506: ☑️ agreed by XuHuaiyu.

@zimulala
Copy link
Contributor

/test check-dev

@tiprow
Copy link

tiprow bot commented Jul 12, 2023

@zimulala: No presubmit jobs available for pingcap/[email protected]

In response to this:

/test check-dev

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 5af21fd into pingcap:release-7.1 Jul 12, 2023
@ti-chi-bot ti-chi-bot removed the cherry-pick-approved Cherry pick PR approved by release team. label Jul 24, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Jul 24, 2023
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-7.1 This PR is cherry-picked to release-7.1 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants