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

spm: add upgrade checklist for SPM #6866

Merged
merged 12 commits into from
Aug 17, 2021
Merged

spm: add upgrade checklist for SPM #6866

merged 12 commits into from
Aug 17, 2021

Conversation

Reminiscent
Copy link
Contributor

@Reminiscent Reminiscent commented Aug 16, 2021 •
edited
Loading

First-time contributors' checklist

What is changed, added or deleted? (Required)

Add upgrade checklist for SPM.

Which TiDB version(s) do your changes apply to? (Required)

Tips for choosing the affected version(s):

By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.

For details, see tips for choosing the affected versions (in Chinese).

  • master (the latest development version)
  • v5.1 (TiDB 5.1 versions)
  • v5.0 (TiDB 5.0 versions)
  • v4.0 (TiDB 4.0 versions)
  • v3.1 (TiDB 3.1 versions)
  • v3.0 (TiDB 3.0 versions)
  • v2.1 (TiDB 2.1 versions)

What is the related PR or file link(s)?

Related to pingcap/tidb#27185
pingcap/tidb#27064
pingcap/tidb#26333.

  • This PR is translated from:
  • Other reference link(s):

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 16, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • TomShawn

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 missing-translation-status This PR does not have translation status info. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 16, 2021
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 16, 2021
@TomShawn TomShawn added translation/doing This PR’s assignee is translating this PR. v5.2 This PR/issue applies to TiDB v5.2. and removed missing-translation-status This PR does not have translation status info. labels Aug 16, 2021
@TomShawn TomShawn requested a review from eurekaka August 16, 2021 04:19
@Reminiscent
Copy link
Contributor Author

@eurekaka @rebelice PTAL

@ti-chi-bot
Copy link
Member

@eurekaka: Thanks for your review. The bot only counts approvals from reviewers and higher roles in list, but you're still welcome to leave your comments.

In response to this:

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.

TomShawn
TomShawn reviewed Aug 16, 2021
View reviewed changes
sql-plan-management.md Outdated

执行计划管理功能（SPM）在版本升级过程中可能会出现一些兼容性问题导致升级失败，你需要在版本升级前做一些检查，确保版本顺利升级。

* 当你尝试从 v5.2 以前的版本升级到此版本，需要注意在升级前检查自动演进的开关 `tidb_evolve_plan_baselines` 是否已经关闭，如果尚未关闭，则需要将其关闭后再进行升级。具体操作如下所示：
Copy link
Contributor

Choose a reason for hiding this comment

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

v5.2 以前的版本也指 v3.1/v3.0/v2.1?

Suggested change
* 当你尝试从 v5.2 以前的版本升级到此版本，需要注意在升级前检查自动演进的开关 `tidb_evolve_plan_baselines` 是否已经关闭，如果尚未关闭，则需要将其关闭后再进行升级。具体操作如下所示：
* 当你尝试从 v5.2 以前的版本（不含 v4.0）升级到此版本，需要注意在升级前检查自动演进的开关 `tidb_evolve_plan_baselines` 是否已经关闭。如果尚未关闭，则需要将其关闭后再进行升级。具体操作如下所示：

Copy link
Contributor Author

Choose a reason for hiding this comment

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

我们现在应该不支持跨大的版本升级，所以这里应该指的是 v4.0/v5.0/v5.1 这三个版本

sql-plan-management.md Outdated Show resolved Hide resolved
sql-plan-management.md Outdated Show resolved Hide resolved
Reminiscent and others added 2 commits August 16, 2021 15:46
@Reminiscent @TomShawn
Update sql-plan-management.md
9080e5e 
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@Reminiscent @TomShawn
Update sql-plan-management.md
10f47d0 
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
Reminiscent
Reminiscent commented Aug 16, 2021
View reviewed changes
sql-plan-management.md Outdated
set global tidb_evolve_plan_baselines = off;
```

* 当你尝试从 v4.0 版本升级到此版本，需要注意在升级前检查所有可用绑定对应的查询语句在新版本中是否存在语法错误。如果存在语法错误，则需要删除对应的绑定。
Copy link
Contributor Author

Choose a reason for hiding this comment

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

该检查需要 cherry-pick 到 v5.0 和 v5.1 这两个版本的文档中。

Copy link
Contributor

Choose a reason for hiding this comment

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

在 v5.0 和 v5.1 文档中，这个【此版本】是指什么版本呢？

TomShawn
TomShawn reviewed Aug 16, 2021
View reviewed changes
sql-plan-management.md Outdated Show resolved Hide resolved
TomShawn
TomShawn reviewed Aug 16, 2021
View reviewed changes
sql-plan-management.md Outdated Show resolved Hide resolved
TomShawn
TomShawn reviewed Aug 16, 2021
View reviewed changes
sql-plan-management.md Outdated Show resolved Hide resolved
TomShawn
TomShawn reviewed Aug 16, 2021
View reviewed changes
sql-plan-management.md Outdated Show resolved Hide resolved
TomShawn
TomShawn reviewed Aug 16, 2021
View reviewed changes
sql-plan-management.md Outdated Show resolved Hide resolved
TomShawn
TomShawn reviewed Aug 16, 2021
View reviewed changes
sql-plan-management.md Outdated

执行计划管理功能（SPM）在版本升级过程中可能会出现一些兼容性问题导致升级失败，你需要在版本升级前做一些检查，确保版本顺利升级。

* 当你尝试从 v5.2 以前的版本（即 v4.0、v5.0、v5.1）升级到此版本，需要注意在升级前检查自动演进的开关 `tidb_evolve_plan_baselines` 是否已经关闭。如果尚未关闭，则需要将其关闭后再进行升级。具体操作如下所示：
Copy link
Contributor

Choose a reason for hiding this comment

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

这里的此版本是指 v5.2 及以后的版本吗？

TomShawn
TomShawn approved these changes Aug 16, 2021
View reviewed changes
Copy link
Contributor

@TomShawn TomShawn 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 ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 16, 2021
@yudongusa
Copy link

LGTM

@yudongusa yudongusa closed this Aug 17, 2021
@yudongusa yudongusa reopened this Aug 17, 2021
@TomShawn
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

@TomShawn: /merge in this pull request requires 2 approval(s).

In response to this:

/merge

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.

@TomShawn
Copy link
Contributor

/remove-status LGT1
/status LGT2

@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 Aug 17, 2021
@TomShawn
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: d72683e

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 17, 2021
@ti-chi-bot
Copy link
Member

@yudongusa: Thanks for your review. The bot only counts approvals from reviewers and higher roles in list, but you're still welcome to leave your comments.

In response to this:

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 merged commit f3e46e5 into pingcap:master Aug 17, 2021
@hfxsd hfxsd assigned hfxsd and unassigned en-jin19 Aug 17, 2021
@hfxsd hfxsd mentioned this pull request Aug 17, 2021
Merged
11 tasks
@hfxsd hfxsd added translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. and removed translation/doing This PR’s assignee is translating this PR. labels Aug 17, 2021
@Reminiscent Reminiscent deleted the doc-banEB branch August 18, 2021 00:43
@TomShawn TomShawn added the type/enhancement The issue or PR belongs to an enhancement. label Aug 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yudongusa yudongusa yudongusa approved these changes

@TomShawn TomShawn TomShawn approved these changes

@eurekaka eurekaka eurekaka approved these changes

Assignees

@hfxsd hfxsd

Labels
size/M Denotes a PR that changes 30-99 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. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. type/enhancement The issue or PR belongs to an enhancement. v5.2 This PR/issue applies to TiDB v5.2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@Reminiscent @ti-chi-bot @yudongusa @TomShawn @eurekaka @hfxsd @en-jin19