Skip to content

Add TiFlash security configuration#5094

Merged
TomShawn merged 6 commits intopingcap:masterfrom
JaySon-Huang:tiflash_redact
Dec 18, 2020
Merged

Add TiFlash security configuration#5094
TomShawn merged 6 commits intopingcap:masterfrom
JaySon-Huang:tiflash_redact

Conversation

@JaySon-Huang
Copy link
Contributor

@JaySon-Huang JaySon-Huang commented Dec 15, 2020

Signed-off-by: JaySon-Huang tshent@qq.com

First-time contributors' checklist

What is changed, added or deleted? (Required)

Add document for security configuration in TiFlash.

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

  • This PR is translated from:
  • Other reference 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

Signed-off-by: JaySon-Huang <tshent@qq.com>
max_memory_usage = 0 # 单次 coprocessor 查询过程中,对中间数据的内存限制,单位为 byte,默认为 0,表示不限制
max_memory_usage_for_all_queries = 0 # 所有查询过程中,对中间数据的内存限制,单位为 byte,默认为 0,表示不限制

## 安全相关配置,从 v4.0.5 开始生效
Copy link
Contributor

Choose a reason for hiding this comment

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

这里提到从 v4.0.5 开始生效,PR 是否需要 cherry-pick 到 release-4.0 呢?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

也钩上了 pick 到 4.0。
redact_info_log 这个配置项暂时没有进 v4.0.9 的版本中。pick 4.0 的时候暂时先不加这个配置项。

Copy link
Contributor

Choose a reason for hiding this comment

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

可以 pick 到 4.0 后再删掉 redact_info_log,以后再加上?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

嗯,是的。

@TomShawn TomShawn requested a review from flowbehappy December 15, 2020 11:17
@TomShawn TomShawn added size/small Changes of a small size. status/PTAL This PR is ready for reviewing. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. needs-cherry-pick-4.0 labels Dec 15, 2020
Co-authored-by: Flowyi <flowbehappy@gmail.com>
Copy link
Contributor

@flowbehappy flowbehappy 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

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

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.

Minor comments on punctuation

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

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 18, 2020
@TomShawn TomShawn added the requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. label Dec 18, 2020
@TomShawn TomShawn merged commit f3fdf28 into pingcap:master Dec 18, 2020
ti-srebot pushed a commit to ti-srebot/docs-cn that referenced this pull request Dec 18, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #5130

@JaySon-Huang JaySon-Huang deleted the tiflash_redact branch December 18, 2020 09:46
TomShawn pushed a commit that referenced this pull request Dec 18, 2020
* cherry pick #5094 to release-4.0

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

* Apply suggestions from code review

Co-authored-by: JaySon <tshent@qq.com>
Co-authored-by: JaySon <jayson.hjs@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. size/small Changes of a small size. status/LGT1 Indicates that a PR has LGTM 1. status/PTAL This PR is ready for reviewing. 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