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

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

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ecab1c8
add docs
wshwsh12 Nov 30, 2020
67282a0
add more information
wshwsh12 Nov 30, 2020
07d866e
address comments
wshwsh12 Nov 30, 2020
0eab1f6
lint
wshwsh12 Nov 30, 2020
2a417f9
s/x/*
wshwsh12 Nov 30, 2020
ed178e9
fix
wshwsh12 Nov 30, 2020
ebaf78f
fix
wshwsh12 Nov 30, 2020
b8b7803
address comments
wshwsh12 Dec 1, 2020
754826f
typo
wshwsh12 Dec 1, 2020
8d96955
address comments
wshwsh12 Dec 1, 2020
46096bc
fix
wshwsh12 Dec 1, 2020
fd9b3c5
address comments
wshwsh12 Dec 1, 2020
ae71900
add info
wshwsh12 Dec 1, 2020
d58a70c
Update configure-memory-usage.md
wshwsh12 Dec 1, 2020
65560a3
Update configure-memory-usage.md
wshwsh12 Dec 1, 2020
dd42f8c
Update tidb-configuration-file.md
wshwsh12 Dec 1, 2020
ebb15d5
addressed
wshwsh12 Dec 1, 2020
e17b3af
address some comments
wshwsh12 Dec 2, 2020
f533258
Update configure-memory-usage.md
TomShawn Dec 2, 2020
82fac32
address commet
wshwsh12 Dec 2, 2020
0583389
address comments
wshwsh12 Dec 2, 2020
140a448
correct indentation
TomShawn Dec 2, 2020
7a80950
refine description
TomShawn Dec 2, 2020
cdd3bf5
Merge branch 'master' into oom-alarm-2
TomShawn Dec 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
address comments
  • Loading branch information
@wshwsh12
wshwsh12 committed Nov 30, 2020
commit 07d866ef07b05f90a03c320fa3bb6087521b2f91
2 changes: 1 addition & 1 deletion tidb-configuration-file.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ TiDB 配置文件比命令行参数支持更多的选项。你可以在 [config/

### `server-memory-quota`

+ TiDB 内存使用限制，单位为字节。
+ tidb-server 实例内存使用限制，单位为字节。
wshwsh12 marked this conversation as resolved.
Show resolved Hide resolved

+ 默认值：0
+ 默认值为 0 表示无内存限制。
Expand Down