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.

Sign up for GitHub

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

Jump to bottom

planner: Revert tidb_allow_mpp modification for downgrade compatibility and add warnings for enforce mpp. (#25302) #25353

Merged
merged 5 commits into from
Jun 11, 2021
Merged

planner: Revert tidb_allow_mpp modification for downgrade compatibility and add warnings for enforce mpp. (#25302) #25353

merged 5 commits into from
Jun 11, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Jun 11, 2021 •
edited
Loading

cherry-pick #25302 to release-5.1
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/25353

After apply modifications, you can push your change to this PR via:

git push [email protected]:ti-srebot/tidb.git pr/25353:release-5.1-1f0245a82142

What problem does this PR solve?

Issue Number: close pingcap/tiflash#1905

Problem Summary: #24516 will let TiDB can't downgrade in some cases.

What is changed and how it works?

Proposal: Enofrce MPP

What's Changed: This PR reverted #24516, introduce a new variable tidb_enforce_mpp and some warning.

How it Works:

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)

Side effects

  • Performance regression
    • Consumes more CPU
    • Consumes more MEM
  • Breaking backward compatibility

Release note

  • Revert

@ti-srebot ti-srebot requested review from a team as code owners June 11, 2021 02:29
@ti-srebot ti-srebot requested review from XuHuaiyu and removed request for a team June 11, 2021 02:29
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot mentioned this pull request Jun 11, 2021
Merged
@ti-srebot ti-srebot added sig/execution SIG execution size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. type/5.1-cherry-pick type/bugfix This PR fixes a bug. labels Jun 11, 2021
@ti-srebot
Copy link
Contributor Author

@LittleFall you're already a collaborator in bot's repo.

@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Jun 11, 2021
@LittleFall
Copy link
Contributor

/run-all-tests

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 11, 2021
@LittleFall
Copy link
Contributor

/run-all-tests

@ti-chi-bot
Copy link
Member

@leiysky: The label(s) sig/execution cannot be applied. These labels are supported: CHANGELOG, challenge-program, compatibility-breaker, contribution, correctness, first-time-contributor, good-first-issue, hacktoberfest, high-performance, hptc, need-more-info, needs-cherry-pick-3.0, needs-cherry-pick-3.1, needs-cherry-pick-4.0, needs-cherry-pick-5.0, proposal, release-note, require-LGT3, security, tools.

In response to this:

/remove-label sig/execution

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 ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot removed the sig/execution SIG execution label Jun 11, 2021
@LittleFall
Copy link
Contributor

/remove-sig execution

@ti-chi-bot
Copy link
Member

@LittleFall: These labels are not set on the issue: sig/execution.

In response to this:

/remove-sig execution

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 ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot removed the sig/sql-infra SIG: SQL Infra label Jun 11, 2021
@LittleFall
Copy link
Contributor

/run-integration-common-test

leiysky
leiysky approved these changes Jun 11, 2021
View reviewed changes
Copy link
Contributor

@leiysky leiysky left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • leiysky
  • lzmhhh123

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jun 11, 2021
@LittleFall
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: f440811

@ti-chi-bot ti-chi-bot added status/can-merge Indicates a PR has been approved by a committer. sig/execution SIG execution labels Jun 11, 2021
@ti-chi-bot
Copy link
Member

@ti-srebot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

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 ti-community-infra/tichi repository.

1 similar comment
@ti-chi-bot
Copy link
Member

@ti-srebot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

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 ti-community-infra/tichi repository.

@github-actions github-actions bot added the sig/sql-infra SIG: SQL Infra label Jun 11, 2021
@ti-chi-bot ti-chi-bot merged commit 0dd2ca4 into pingcap:release-5.1 Jun 11, 2021
@LittleFall LittleFall deleted the release-5.1-1f0245a82142 branch June 11, 2021 07:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lzmhhh123 lzmhhh123 lzmhhh123 approved these changes

@leiysky leiysky leiysky approved these changes

@hanfei1991 hanfei1991 hanfei1991 approved these changes

@XuHuaiyu XuHuaiyu Awaiting requested review from XuHuaiyu

Assignees

@LittleFall LittleFall

Labels
cherry-pick-approved Cherry pick PR approved by release team. component/config sig/execution SIG execution sig/sql-infra SIG: SQL Infra size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug. type/5.1-cherry-pick
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@ti-srebot @LittleFall @ti-chi-bot @hanfei1991 @leiysky @lzmhhh123 @zhouqiang-cl