Jcrespo has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372423 )
Change subject: dbstore_multiinstance: reduce key_buffer, set read only
......................................................................
dbstore_multiinstance: reduce key_buffer, set read only
Set myisam/aria key_buffer to 1M, as it is mostly unused.
Set read only to configuration dependent.
Also rename the template from dbstore3 to dbstore_multiinstance.
Add comment about potential buffer pool size override.
Bug: T169514
Change-Id: If8d3142fdab66f2cef9d59612866125a00f648e2
---
M modules/role/manifests/mariadb/dbstore_multiinstance.pp
R modules/role/templates/mariadb/mysqld_config/dbstore_multiinstance.my.cnf.erb
2 files changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/23/372423/1
diff --git a/modules/role/manifests/mariadb/dbstore_multiinstance.pp
b/modules/role/manifests/mariadb/dbstore_multiinstance.pp
index bbfa92d..6efd1b0 100644
--- a/modules/role/manifests/mariadb/dbstore_multiinstance.pp
+++ b/modules/role/manifests/mariadb/dbstore_multiinstance.pp
@@ -34,7 +34,7 @@
# Read only forced on also for the masters of the primary datacenter
class { 'mariadb::config':
basedir => $basedir,
- config => 'role/mariadb/mysqld_config/dbstore3.my.cnf.erb',
+ config =>
'role/mariadb/mysqld_config/dbstore_multiinstance.my.cnf.erb',
p_s => 'on',
ssl => 'puppet-cert',
binlog_format => 'ROW',
diff --git a/modules/role/templates/mariadb/mysqld_config/dbstore3.my.cnf.erb
b/modules/role/templates/mariadb/mysqld_config/dbstore_multiinstance.my.cnf.erb
similarity index 96%
rename from modules/role/templates/mariadb/mysqld_config/dbstore3.my.cnf.erb
rename to
modules/role/templates/mariadb/mysqld_config/dbstore_multiinstance.my.cnf.erb
index 50fde34..4836e3c 100644
--- a/modules/role/templates/mariadb/mysqld_config/dbstore3.my.cnf.erb
+++
b/modules/role/templates/mariadb/mysqld_config/dbstore_multiinstance.my.cnf.erb
@@ -21,7 +21,8 @@
#
gtid_domain_id = <%= @gtid_domain_id %>
-read_only = 0
+read_only = <%= @read_only %>
+key_buffer_size = 1048576
# enable socket authentication
plugin-load = unix_socket=auth_socket.so
@@ -45,6 +46,7 @@
collation_server = binary
innodb_file_per_table = 1
+# this can get overiden by per-instance configuration
innodb_buffer_pool_size = 15G
innodb_log_file_size = 4G
innodb_flush_log_at_trx_commit = 0
--
To view, visit https://gerrit.wikimedia.org/r/372423
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If8d3142fdab66f2cef9d59612866125a00f648e2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
