Asher has submitted this change and it was merged.
Change subject: labsdbs: disable binlogs, relax locking, bufferpool sized for hw
......................................................................
labsdbs: disable binlogs, relax locking, bufferpool sized for hw
Change-Id: I0033642420264bc7e6f808113540d412f1ed67e2
---
M manifests/site.pp
M modules/mysql_multi_instance/manifests/instance.pp
2 files changed, 67 insertions(+), 47 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 4245512..d6080ff 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1210,59 +1210,73 @@
## labsdb dbs
node 'labsdb1001.eqiad.wmnet' {
- class { role::db::labsdb:
- instances => {
- 's1' => {
- 'port' => 3306,
- 'innodb_log_file_size' => "2000M",
- 'ram' => "72G"
- },
- }
- }
+ class { role::db::labsdb:
+ instances => {
+ 's1' => {
+ 'port' => 3306,
+ 'innodb_log_file_size' => "2000M",
+ 'ram' => "151G",
+ 'log_bin' => false,
+ 'innodb_locks_unsafe_for_binlog' => true,
+ },
+ }
+ }
}
node 'labsdb1002.eqiad.wmnet' {
- class { role::db::labsdb:
- instances => {
- 's2' => {
- 'port' => 3306,
- 'innodb_log_file_size' => "2000M",
- 'ram' => "24G"
- },
- 's4' => {
- 'port' => 3307,
- 'innodb_log_file_size' => "2000M",
- 'ram' => "24G"
- },
- 's5' => {
- 'port' => 3308,
- 'innodb_log_file_size' => "1000M",
- 'ram' => "24G"
- },
- }
- }
+ class { role::db::labsdb:
+ instances => {
+ 's2' => {
+ 'port' => 3306,
+ 'innodb_log_file_size' => "2000M",
+ 'ram' => "48G",
+ 'log_bin' => false,
+ 'innodb_locks_unsafe_for_binlog' => true,
+ },
+ 's4' => {
+ 'port' => 3307,
+ 'innodb_log_file_size' => "2000M",
+ 'ram' => "48G",
+ 'log_bin' => false,
+ 'innodb_locks_unsafe_for_binlog' => true,
+ },
+ 's5' => {
+ 'port' => 3308,
+ 'innodb_log_file_size' => "1000M",
+ 'ram' => "48G",
+ 'log_bin' => false,
+ 'innodb_locks_unsafe_for_binlog' => true,
+ },
+ }
+ }
}
node 'labsdb1003.eqiad.wmnet' {
- class { role::db::labsdb:
- instances => {
- 's3' => {
- 'port' => 3306,
- 'innodb_log_file_size' => "500M",
- 'ram' => "24G"
- },
- 's6' => {
- 'port' => 3307,
- 'innodb_log_file_size' => "500M",
- 'ram' => "24G"
- },
- 's7' => {
- 'port' => 3308,
- 'innodb_log_file_size' => "500M",
- 'ram' => "24G"
- },
- }
- }
+ class { role::db::labsdb:
+ instances => {
+ 's3' => {
+ 'port' => 3306,
+ 'innodb_log_file_size' => "500M",
+ 'ram' => "48G",
+ 'log_bin' => false,
+ 'innodb_locks_unsafe_for_binlog' => true,
+ },
+ 's6' => {
+ 'port' => 3307,
+ 'innodb_log_file_size' => "500M",
+ 'ram' => "48G",
+ 'log_bin' => false,
+ 'innodb_locks_unsafe_for_binlog' => true,
+ },
+ 's7' => {
+ 'port' => 3308,
+ 'innodb_log_file_size' => "500M",
+ 'ram' => "48G",
+ 'log_bin' => false,
+ 'innodb_locks_unsafe_for_binlog' => true,
+ },
+ }
+ }
}
node /labstore[12]\.pmtpa\.wmnet/ {
diff --git a/modules/mysql_multi_instance/manifests/instance.pp
b/modules/mysql_multi_instance/manifests/instance.pp
index d65ffd9..8368936 100644
--- a/modules/mysql_multi_instance/manifests/instance.pp
+++ b/modules/mysql_multi_instance/manifests/instance.pp
@@ -24,6 +24,11 @@
}else {
$log_bin = true
}
+ if has_key( $instances[$name], 'innodb_locks_unsafe_for_binlog') {
+ $innodb_locks_unsafe_for_binlog =
$instances[$name]['innodb_locks_unsafe_for_binlog']
+ }else {
+ $innodb_locks_unsafe_for_binlog = false
+ }
$serverid = inline_template("<%= ia = ipaddress.split('.'); server_id =
ia[0] + ia[2] + ia[3] + String($port); server_id %>")
include passwords::nagios::mysql
@@ -94,6 +99,7 @@
'innodb-write-io-threads' => 8,
'innodb-checksums' =>1,
'innodb_file_per_table' => true,
+ 'innodb_locks_unsafe_for_binlog' => $innodb_locks_unsafe_for_binlog,
'skip-external-locking' => true,
'skip-name-resolve' => true,
'key_buffer' => 1M,
--
To view, visit https://gerrit.wikimedia.org/r/64495
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0033642420264bc7e6f808113540d412f1ed67e2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher <[email protected]>
Gerrit-Reviewer: Asher <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
