Skip to content

Commit 315887a

Browse files
bananaappletwAMecea
authored andcommitted
Only add binlog-space-limit for percona image
1 parent 677a2ce commit 315887a

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
1313
* Add Google Drive via service account as backup option.
1414
* Add `initBucketURL` and `initBucketSecretName` options to MysqlCluster chart. This bumps the chart version to `0.3.0`
1515
### Changed
16+
* Only add `binlog-space-limit` for `percona` image
1617
* Set timeout of 15s on connection between the operator and Orchestrator
1718
* Bump controller-util dependency to 0.1.18 which fixes some updates on pod spec.
1819
* Removed `NO_AUTO_VALUE_ON_ZERO` from `sql-mode` to be inline with MySQL default value

pkg/internal/mysqlcluster/defaults.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package mysqlcluster
1919
import (
2020
"fmt"
2121
"math"
22+
"regexp"
2223

2324
core "k8s.io/api/core/v1"
2425
"k8s.io/apimachinery/pkg/api/resource"
@@ -105,8 +106,10 @@ func (cluster *MysqlCluster) SetDefaults(opt *options.Options) {
105106
maxBinlogSize = min(binlogSpaceLimit/3, 1*gb)
106107
}
107108

108-
// binlog-space-limit = totalSpace / 2
109-
setConfigIfNotSet(cluster.Spec.MysqlConf, "binlog-space-limit", humanizeSize(binlogSpaceLimit))
109+
if matched, err := regexp.MatchString("([a-z.]+/)*percona(:.+)?", cluster.Spec.Image); err != nil && matched {
110+
// binlog-space-limit = totalSpace / 2
111+
setConfigIfNotSet(cluster.Spec.MysqlConf, "binlog-space-limit", humanizeSize(binlogSpaceLimit))
112+
}
110113

111114
// max-binlog-size = min(binlog-space-limit / 4, 1*gb)
112115
setConfigIfNotSet(cluster.Spec.MysqlConf, "max-binlog-size", humanizeSize(maxBinlogSize))

0 commit comments

Comments
 (0)