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

config: change the default value of txn-total-size-limit, add comment about its conflict with binlog #14522

Merged
merged 7 commits into from
Jan 21, 2020
Merged

config: change the default value of txn-total-size-limit, add comment about its conflict with binlog #14522

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3090482
config: change the default value of txn-total-size-limit, add comment…
tiancaiamao Jan 18, 2020
215781d
address comment
tiancaiamao Jan 18, 2020
7b3504f
fix CI
tiancaiamao Jan 18, 2020
cec7254
typo
tiancaiamao Jan 18, 2020
a4cbfe9
address comment
tiancaiamao Jan 19, 2020
54c6801
Merge branch 'master' into config-update
sre-bot Jan 20, 2020
44d6238
Merge branch 'master' into config-update
zz-jason Jan 21, 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
2 changes: 1 addition & 1 deletion config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import (
const (
MaxLogFileSize = 4096 // MB
// DefTxnTotalSizeLimit is the default value of TxnTxnTotalSizeLimit.
DefTxnTotalSizeLimit = 1024 * 1024 * 1024
DefTxnTotalSizeLimit = 100 * 1024 * 1024
)

// Valid config maps
Expand Down
7 changes: 4 additions & 3 deletions config/config.toml.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,9 @@ bind-info-lease = "3s"

# The limitation of the size in byte for the entries in one transaction.
# If using TiKV as the storage, the entry represents a key/value pair.
# WARNING: Do not set the value too large, otherwise it will make a very large impact on the TiKV cluster.
# Please adjust this configuration carefully.
txn-total-size-limit = 1073741824
# NOTE: If binlog is enabled, this value should be less than 104857600(10M) because this is the maximum size that can be handled by Pumper.
# If binlog is not enabled, this value should be less than 10737418240(10G).
txn-total-size-limit = 104857600

[proxy-protocol]
# PROXY protocol acceptable client networks.
Expand Down Expand Up @@ -327,6 +327,7 @@ capacity = 2048000

[binlog]
# enable to write binlog.
# NOTE: If binlog is enabled, txn-total-size-limit should be less than 104857600(10M).
enable = false

# WriteTimeout specifies how long it will wait for writing binlog to pump.
Expand Down