database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

config: remove the special limit of txn-total-size-limit when binlog enabled (#16919)

Browse Source
This commit is contained in:
Jack Yu
2020-04-29 21:40:18 +08:00
committed by GitHub
parent 46e37a1700
commit 4bfc39fe52
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/config.go
View File

@ -828,9 +828,6 @@ func (c *Config) Valid() error {
return fmt.Errorf("grpc-connection-count should be greater than 0")
}
if c.Performance.TxnTotalSizeLimit > 100<<20 && c.Binlog.Enable {
return fmt.Errorf("txn-total-size-limit should be less than %d with binlog enabled", 100<<20)
}
if c.Performance.TxnTotalSizeLimit > 10<<30 {
return fmt.Errorf("txn-total-size-limit should be less than %d", 10<<30)
}

5
config/config.toml.example
View File

@ -237,8 +237,9 @@ distinct-agg-push-down = false
# 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.
# 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).
# NOTE: If binlog is enabled with Kafka (e.g. arbiter cluster),
# this value should be less than 1073741824(1G) because this is the maximum size that can be handled by Kafka.
# If binlog is disabled or binlog is enabled without Kafka, this value should be less than 10737418240(10G).
txn-total-size-limit = 104857600
# The max number of running concurrency two phase committer request for an SQL.

4
config/config_test.go
View File

@ -385,10 +385,6 @@ func (s *testConfigSuite) TestTxnTotalSizeLimitValid(c *C) {
conf.Performance.TxnTotalSizeLimit = tt.limit
c.Assert(conf.Valid() == nil, Equals, tt.valid)
}
conf.Binlog.Enable = true
conf.Performance.TxnTotalSizeLimit = 100<<20 + 1
c.Assert(conf.Valid(), NotNil)
}
func (s *testConfigSuite) TestAllowAutoRandomValid(c *C) {