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

Deprecate config item max-memory and add items server-memory-quota and memory-usage-alarm-ratio #4977

Merged
merged 24 commits into from
Dec 2, 2020
Merged

Deprecate config item max-memory and add items server-memory-quota and memory-usage-alarm-ratio #4977

merged 24 commits into from
Dec 2, 2020

Conversation

wshwsh12
Copy link
Contributor

@wshwsh12 wshwsh12 commented Nov 30, 2020 •
edited by TomShawn
Loading

First-time contributors' checklist

What is changed, added or deleted? (Required)

Deprecate config item max-memory and add items server-memory-quota and memory-usage-alarm-ratio (only in dev)

max-memory has been deprecated and use server-memory-quota instead now. (only in dev)
memory-usage-alarm-ratio is introduced in this pr pingcap/tidb#18858.

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

  • master (the latest development version)
  • v4.0 (TiDB 4.0 versions) (need a special version)
  • 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)?

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

@wshwsh12
Copy link
Contributor Author

/cc @XuHuaiyu

@ti-srebot ti-srebot requested a review from XuHuaiyu November 30, 2020 06:11
@TomShawn TomShawn added needs-cherry-pick-4.0 size/medium Changes of a medium size. status/require-change Needs the author to address comments. translation/doing This PR’s assignee is translating this PR. labels Nov 30, 2020
@wshwsh12 wshwsh12 requested a review from XuHuaiyu November 30, 2020 07:46
XuHuaiyu
XuHuaiyu reviewed Dec 1, 2020
View reviewed changes
tidb-configuration-file.md Outdated Show resolved Hide resolved
configure-memory-usage.md Outdated Show resolved Hide resolved
configure-memory-usage.md Outdated Show resolved Hide resolved
configure-memory-usage.md Outdated Show resolved Hide resolved
configure-memory-usage.md Outdated Show resolved Hide resolved
configure-memory-usage.md Outdated Show resolved Hide resolved
configure-memory-usage.md Outdated Show resolved Hide resolved
configure-memory-usage.md Outdated Show resolved Hide resolved
@wshwsh12 wshwsh12 requested a review from XuHuaiyu December 1, 2020 07:45
XuHuaiyu
XuHuaiyu reviewed Dec 1, 2020
View reviewed changes
configure-memory-usage.md Outdated Show resolved Hide resolved
configure-memory-usage.md Outdated Show resolved Hide resolved
configure-memory-usage.md Outdated Show resolved Hide resolved
configure-memory-usage.md Outdated Show resolved Hide resolved
configure-memory-usage.md Outdated Show resolved Hide resolved
configure-memory-usage.md Outdated Show resolved Hide resolved
configure-memory-usage.md Outdated Show resolved Hide resolved
configure-memory-usage.md Outdated Show resolved Hide resolved
@wshwsh12 wshwsh12 requested a review from XuHuaiyu December 1, 2020 08:29
XuHuaiyu
XuHuaiyu reviewed Dec 1, 2020
View reviewed changes
configure-memory-usage.md Outdated Show resolved Hide resolved
@XuHuaiyu
Copy link
Contributor

XuHuaiyu commented Dec 1, 2020

LGTM

@ti-srebot
Copy link
Contributor

@XuHuaiyu, Thanks for your review. The bot only counts LGTMs from Reviewers and higher roles, but you're still welcome to leave your comments. See the corresponding SIG page for more information. Related SIG: docs(slack).

CharLotteiu
CharLotteiu reviewed Dec 1, 2020
View reviewed changes
configure-memory-usage.md Outdated Show resolved Hide resolved
configure-memory-usage.md Outdated Show resolved Hide resolved
tidb-configuration-file.md Outdated Show resolved Hide resolved
configure-memory-usage.md Outdated Show resolved Hide resolved
@wshwsh12 wshwsh12 requested a review from CharLotteiu December 1, 2020 09:22
TomShawn
TomShawn reviewed Dec 2, 2020
View reviewed changes
configure-memory-usage.md Show resolved Hide resolved
configure-memory-usage.md Outdated Show resolved Hide resolved
configure-memory-usage.md Show resolved Hide resolved
configure-memory-usage.md Outdated Show resolved Hide resolved
configure-memory-usage.md Outdated Show resolved Hide resolved
system-variables.md Outdated Show resolved Hide resolved
tidb-configuration-file.md Outdated Show resolved Hide resolved
tidb-configuration-file.md Outdated Show resolved Hide resolved
tidb-configuration-file.md Outdated Show resolved Hide resolved
tidb-configuration-file.md
@@ -278,11 +278,24 @@ TiDB 配置文件比命令行参数支持更多的选项。你可以在 [config/
+ 默认值：0
+ 默认值为 0 表示使用机器上所有的 CPU；如果设置成 n，那么 TiDB 会使用 n 个 CPU 数量。

### `max-memory`
Copy link
Contributor

Choose a reason for hiding this comment

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

可能有用户还在使用这个配置项，废弃这个配置项是否需要说明一下呢？

  • 不推荐使用/已不能使用/已被新的配置项替代？
  • 从哪个版本废弃的？

TomShawn
TomShawn reviewed Dec 2, 2020
View reviewed changes
tidb-configuration-file.md Outdated
>
> `server-memory-quota` 目前为实验性特性，不建议在生产环境中使用。

+ tidb-server 实例内存的使用限制，单位为字节。(原配置项 `max-memory` 已被该配置项代替)
Copy link
Contributor

Choose a reason for hiding this comment

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

原配置项 max-memory 被一个实验特性配置项所替代？

@TomShawn TomShawn added the requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. label Dec 2, 2020
TomShawn
TomShawn approved these changes Dec 2, 2020
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-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 2, 2020
@TomShawn TomShawn merged commit ddaa9de into pingcap:master Dec 2, 2020
ti-srebot pushed a commit to ti-srebot/docs-cn that referenced this pull request Dec 2, 2020
@wshwsh12 @ti-srebot
cherry pick pingcap#4977 to release-4.0
0629274 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Dec 2, 2020
Merged
10 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #5009

@TomShawn TomShawn added requires-followup This PR requires a follow-up task after being merged. and removed status/require-change Needs the author to address comments. labels Dec 2, 2020
@TomShawn
Copy link
Contributor

TomShawn commented Dec 2, 2020 •
edited
Loading

Follow-up: remove the <!-- New in TiDB v5.0 --> comment.

ti-srebot added a commit that referenced this pull request Dec 2, 2020
@ti-srebot
Deprecate config item max-memory and add items `server-memory-quota…
0aab4b9 
…` and `memory-usage-alarm-ratio` (#4977) (#5009)
@CharLotteiu CharLotteiu mentioned this pull request Dec 4, 2020
Merged
9 tasks
@CharLotteiu CharLotteiu 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 Dec 4, 2020
@TomShawn TomShawn added size/large Changes of a large size. and removed size/medium Changes of a medium size. labels Dec 4, 2020
@ti-srebot ti-srebot mentioned this pull request Dec 10, 2020
Merged
9 tasks
@TomShawn
Copy link
Contributor

/remove-label follow-up

@ti-chi-bot ti-chi-bot removed the requires-followup This PR requires a follow-up task after being merged. label Mar 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@XuHuaiyu XuHuaiyu XuHuaiyu left review comments

@TomShawn TomShawn TomShawn approved these changes

@CharLotteiu CharLotteiu Awaiting requested review from CharLotteiu

Assignees

@CharLotteiu CharLotteiu

Labels
requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. size/large Changes of a large size. status/LGT1 Indicates that a PR has LGTM 1. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@wshwsh12 @XuHuaiyu @ti-srebot @TomShawn @CharLotteiu @ti-chi-bot