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

reference/configuration: update tidb-server configuration #2685

Merged
merged 11 commits into from
Apr 14, 2020
Merged

reference/configuration: update tidb-server configuration #2685

Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
33cc55d
add tidb configuration
Apr 9, 2020
e555fad
Update reference/configuration/tidb-server/configuration-file.md
Yisaer Apr 9, 2020
cf9c241
revise document
Apr 9, 2020
2e8443f
Update configuration-file.md
Apr 9, 2020
ddc54fc
add period
Apr 9, 2020
80b4f60
address the comment
Apr 10, 2020
9fbaad6
Merge branch 'master' into add_tidb_configuration
Yisaer Apr 10, 2020
2b481cf
Update reference/configuration/tidb-server/configuration-file.md
Yisaer Apr 14, 2020
89af040
Update reference/configuration/tidb-server/configuration-file.md
Yisaer Apr 14, 2020
f22a1d3
Update reference/configuration/tidb-server/configuration-file.md
Yisaer Apr 14, 2020
54cc841
Merge branch 'master' into add_tidb_configuration
TomShawn Apr 14, 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
8 changes: 8 additions & 0 deletions reference/configuration/tidb-server/configuration-file.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@ TiDB 配置文件比命令行参数支持更多的选项。你可以在 [config/
+ 默认值：`<操作系统临时文件夹>/tidb/tmp-storage`
+ 此配置仅在 `oom-use-tmp-storage` 为 true 时有效。

### `temp-storage-quota`

+ 当 `oom-use-tmp-storage` 开启时，对于 `tmp-storage-path` 存储使用的限额，单位为字节。
Copy link
Contributor

Choose a reason for hiding this comment

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

我觉得前半句不用了。 不然这句信息太多。
cc @zz-jason

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated.

+ 当 `tmp-storage-path` 的剩余可用容量低于 `temp-storage-quota` 所定义的值时，tidb-server 启动时将会报出错误并退出。
Copy link
Contributor

Choose a reason for hiding this comment

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

这句可以放到最后

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated.

+ 当单条 SQL 语句使用临时磁盘，导致 tidb-server 的总体临时磁盘总量超过 `temp-storage-quota` 时，将会取消当前 SQL 操作，并返回 `Out Of Global Storage Quota!`
Yisaer marked this conversation as resolved.
Show resolved Hide resolved
+ 当 `temp-storage-quota` 小于 0 时则没有上述检查与限制。
+ 默认值: -1

### `oom-action`

+ 当 TiDB 中单条 SQL 的内存使用超出 `mem-quota-query` 限制且不能再利用临时磁盘时的行为。
Expand Down