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 #4333

Merged
merged 7 commits into from
Dec 10, 2020
Merged

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

merged 7 commits into from
Dec 10, 2020

Conversation

CharLotteiu
Copy link
Contributor

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)
  • 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

@CharLotteiu CharLotteiu added needs-cherry-pick-4.0 status/PTAL This PR is ready for reviewing. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. labels Dec 4, 2020
@TomShawn TomShawn added the size/large Changes of a large size. label Dec 4, 2020
@ti-srebot
Copy link
Contributor

@wshwsh12, @TomShawn, PTAL.

wshwsh12
wshwsh12 reviewed Dec 7, 2020
View reviewed changes
Copy link
Contributor

@wshwsh12 wshwsh12 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
Copy link
Contributor

@wshwsh12, 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).

TomShawn
TomShawn reviewed Dec 8, 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.

Some minor comments on wording~

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
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 Outdated Show resolved Hide resolved
tidb-configuration-file.md Outdated Show resolved Hide resolved
CharLotteiu and others added 2 commits December 8, 2020 15:13
@CharLotteiu @TomShawn
Apply suggestions from code review
3327c0a 
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@CharLotteiu @TomShawn
Update tidb-configuration-file.md
2782820 
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
TomShawn
TomShawn reviewed Dec 8, 2020
View reviewed changes
tidb-configuration-file.md Outdated Show resolved Hide resolved
@ti-srebot
Copy link
Contributor

@wshwsh12, @TomShawn, PTAL.

TomShawn
TomShawn approved these changes Dec 10, 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 10, 2020
@TomShawn TomShawn merged commit d58f0ba into pingcap:master Dec 10, 2020
ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Dec 10, 2020
@CharLotteiu @ti-srebot
cherry pick pingcap#4333 to release-4.0
672828d 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Dec 10, 2020
Merged
9 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #4385

@TomShawn TomShawn added the requires-followup This PR requires a follow-up task after being merged. label Dec 10, 2020
@TomShawn
Copy link
Contributor

Follow-up: remove <!-- New in 5.0 -->

TomShawn added a commit that referenced this pull request Dec 10, 2020
@ti-srebot @CharLotteiu @TomShawn
Deprecate config item max-memory and add items `server-memory-quota…
c5987df 
…` and `memory-usage-alarm-ratio` (#4333) (#4385)

* cherry pick #4333 to release-4.0

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

* resolve conflicts and apply version-specific changes

* Update system-variables.md

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>

Co-authored-by: Charlotte Liu <37295236+CharLotteiu@users.noreply.github.com>
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@CharLotteiu CharLotteiu deleted the add-oom-alarm branch December 17, 2020 09:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wshwsh12 wshwsh12 wshwsh12 left review comments

@TomShawn TomShawn TomShawn approved these changes

Assignees
No one assigned
Labels
requires-followup This PR requires a follow-up task after being merged. 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. status/PTAL This PR is ready for reviewing. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@CharLotteiu @ti-srebot @TomShawn @wshwsh12