Skip to content

test: stabilize flaky TestCancelVariousJobs and TestExchangePartitionMultiTable (release-6.5-20260928-v6.5.6) - #71665

Merged
bb7133 merged 2 commits into
pingcap:release-6.5-20260928-v6.5.6from
bb7133:cherry-pick/71554-release-6.5-20260928-v6.5.6
Sep 29, 2026
Merged

bb7133 merged 2 commits into
pingcap:release-6.5-20260928-v6.5.6from
bb7133:cherry-pick/71554-release-6.5-20260928-v6.5.6

Conversation

@bb7133

@bb7133 bb7133 commented Sep 28, 2026 •

Copy link
Copy Markdown
Member

What problem does this PR solve?

Issue Number: close #71547

Problem Summary:

Backport #71399 and #71402 to release-6.5-20260928-v6.5.6.

What changed and how does it work?

Two cherry-picks, applied in the order they merged to master.

Check List

Tests

  • Unit test
  • Integration test
  • 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

None

bb7133 and others added 2 commits September 28, 2026 06:06
close pingcap#71398

(cherry picked from commit 883ce9a)

Conflicts resolved for this release branch:
- This branch predates the pkg/ source layout; the changes were applied to the
  equivalent files planner/core/planbuilder.go and planner/core/preprocess.go
  (not pkg/planner/core/...).
- planner/core uses the package-local ErrTableaccessDenied (no plannererrors
  alias here); the test file uses core.ErrTableaccessDenied and
  errno.ErrTableaccessDenied.
Behaviour and tests are preserved.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
(cherry picked from commit d289d6f)
close pingcap#71400

(cherry picked from commit 90ecf49)

Conflicts resolved for this release branch:
- This branch predates the pkg/ source layout; changes were applied to the
  equivalent files ddl/ddl_api.go and planner/core/planbuilder.go
  (not pkg/ddl/... or pkg/planner/core/...).
- pkg/ddl/executor.go does not exist here; ExchangeTablePartition lives in
  ddl/ddl_api.go, so the system-table guard was applied there instead.
- The upstream guard used metadef.IsReservedID(id) with dbterror.ErrForbiddenDDL,
  neither of which exists here; substituted util.IsMemOrSysDB and
  dbterror.ErrGeneralUnsupportedDDL, preserving the error message.
- The getLowerDB helper is absent; its equivalent (the lowercased new-table
  schema, falling back to the current database) is inlined at the call site.
- planner/core uses the package-local ErrTableaccessDenied (no plannererrors
  alias here); the test file uses core.ErrTableaccessDenied. Session().Auth
  here takes three arguments, matching this branch's signature.
Behaviour and tests are preserved (mysql.tidb_ddl_job is in a system DB).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
(cherry picked from commit ccd89b3)
@ti-chi-bot ti-chi-bot 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. labels Sep 28, 2026
@ti-chi-bot ti-chi-bot Bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Sep 29, 2026

@wjhuang2016 wjhuang2016 left a comment •

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot ti-chi-bot Bot added the lgtm label Sep 29, 2026
@ti-chi-bot

ti-chi-bot Bot commented Sep 29, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: D3Hunter, 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:
  • OWNERS [D3Hunter,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 removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Sep 29, 2026
@ti-chi-bot

ti-chi-bot Bot commented Sep 29, 2026

Copy link
Copy Markdown

[LGTM Timeline notifier]

Timeline:

  • 2026-09-29 02:36:04.160764775 +0000 UTC m=+677089.385985872: ☑️ agreed by D3Hunter.
  • 2026-09-29 02:37:25.940855201 +0000 UTC m=+677171.166076298: ☑️ agreed by wjhuang2016.

@bb7133

bb7133 commented Sep 29, 2026

Copy link
Copy Markdown
Member Author

/retest

1 similar comment
@bb7133

bb7133 commented Sep 29, 2026

Copy link
Copy Markdown
Member Author

/retest

@ti-chi-bot

ti-chi-bot Bot commented Sep 29, 2026

Copy link
Copy Markdown

@bb7133: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
idc-jenkins-ci-tidb/unit-test 8bcc188 link true /test unit-test

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@bb7133
bb7133 merged commit 8213131 into pingcap:release-6.5-20260928-v6.5.6 Sep 29, 2026
7 of 9 checks passed
@bb7133
bb7133 deleted the cherry-pick/71554-release-6.5-20260928-v6.5.6 branch September 29, 2026 09:36
@pingcap pingcap deleted a comment from coderabbitai Bot Oct 9, 2026
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/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants