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.

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

reference/configuration: update tidb-server configuration #2685

Merged
merged 11 commits into from
Apr 14, 2020

Conversation

Yisaer
Copy link
Contributor

@Yisaer Yisaer commented Apr 9, 2020

What is changed, added or deleted? (Required)

add new configuration in tidb-server configuration document

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)

If you select two or more versions from above, to trigger the bot to cherry-pick this PR to your desired release version branch(es), you must add corresponding labels such as needs-cherry-pick-4.0, needs-cherry-pick-3.1, needs-cherry-pick-3.0, and needs-cherry-pick-2.1.

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

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

pingcap/tidb#15700

@SunRunAway SunRunAway requested a review from TomShawn April 9, 2020 10:34
@@ -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.

### `temp-storage-quota`

+ 当 `oom-use-tmp-storage` 开启时,对于 `tmp-storage-path` 存储使用的限额,单位为字节。
+ 当 `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.

@TomShawn TomShawn added translation/doing This PR’s assignee is translating this PR. size/small Changes of a small size. labels Apr 9, 2020
@TomShawn TomShawn self-assigned this Apr 9, 2020
@Yisaer Yisaer requested a review from SunRunAway April 10, 2020 03:26
Copy link
Contributor

@SunRunAway SunRunAway left a comment

Choose a reason for hiding this comment

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

LGTM

Yisaer and others added 3 commits April 14, 2020 11:38
Co-Authored-By: TomShawn <41534398+TomShawn@users.noreply.github.com>
Co-Authored-By: TomShawn <41534398+TomShawn@users.noreply.github.com>
Co-Authored-By: TomShawn <41534398+TomShawn@users.noreply.github.com>
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

@TomShawn TomShawn added the status/can-merge Indicates a PR has been approved by a committer. label Apr 14, 2020
@sre-bot
Copy link
Contributor

sre-bot commented Apr 14, 2020

/run-all-tests

@sre-bot sre-bot merged commit 08b32a4 into pingcap:master Apr 14, 2020
sre-bot pushed a commit to sre-bot/docs-cn that referenced this pull request Apr 14, 2020
@sre-bot
Copy link
Contributor

sre-bot commented Apr 14, 2020

cherry pick to release-4.0 in PR #2728

@TomShawn TomShawn 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 Apr 15, 2020
rleungx pushed a commit to rleungx/docs-cn that referenced this pull request May 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/small Changes of a small size. status/can-merge Indicates a PR has been approved by a committer. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants