diff --git a/software/erp5/instance-mariadb-input-schema.json b/software/erp5/instance-mariadb-input-schema.json index b6e3912479acb7017d61d307542601922dddd5a5..9621c54ea2b9989e8d8b67979caaeac7d64a0d84 100644 --- a/software/erp5/instance-mariadb-input-schema.json +++ b/software/erp5/instance-mariadb-input-schema.json @@ -86,7 +86,7 @@ "default": 1, "type": "number" }, - "mariadb-relaxed-writes": { + "relaxed-writes": { "description": "When enabled, sets innodb_flush_log_at_trx_commit = 0, innodb_flush_method = nosync, innodb_doublewrite = 0 and sync_frm = 0 - RTFM, those options are dangerous", "default": false, "type": "boolean" diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg index c7dc3c6ad76542645f86b89b89e1083caa4c356d..a7b49b41497ef861cc311796d7a765ffe0132d80 100644 --- a/stack/erp5/buildout.cfg +++ b/stack/erp5/buildout.cfg @@ -172,7 +172,7 @@ context = [template-mariadb] < = download-base filename = instance-mariadb.cfg.in -md5sum = a6e40c2d9f223e5d29d80d81a35d422f +md5sum = d51a5ad6cfa76b7bc20519694e88df80 link-binary = ${coreutils:location}/bin/basename ${coreutils:location}/bin/cat diff --git a/stack/erp5/instance-mariadb.cfg.in b/stack/erp5/instance-mariadb.cfg.in index c7b5e9c415ad0aa124b642966434c04491d6ef95..8f1c261668005ad515a675e29c56408f4cb8a966 100644 --- a/stack/erp5/instance-mariadb.cfg.in +++ b/stack/erp5/instance-mariadb.cfg.in @@ -68,7 +68,7 @@ long-query-time = {{ slapparameter_dict.get('long-query-time', 1) }} innodb-buffer-pool-size = {{ dumps(slapparameter_dict.get('innodb-buffer-pool-size', 0)) }} innodb-log-file-size = {{ dumps(slapparameter_dict.get('innodb-log-file-size', 0)) }} innodb-log-buffer-size = {{ dumps(slapparameter_dict.get('innodb-log-buffer-size', 0)) }} -relaxed-writes = {{ dumps(slapparameter_dict.get('mariadb-relaxed-writes', False)) }} +relaxed-writes = {{ dumps(slapparameter_dict.get('relaxed-writes', False)) }} {% if incremental_backup_retention_days > -1 -%} binlog-path = ${directory:mariadb-backup-incremental}/binlog # XXX: binlog rotation happens along with other log's rotation