[MediaWiki-commits] [Gerrit] labsdb: set innodb_locks_unsafe_for_binlog for s4-5, set hig... - change (operations/puppet)

[Asher (Code Review)]

Asher has submitted this change and it was merged.

Change subject: labsdb: set innodb_locks_unsafe_for_binlog for s4-5, set high 
slave_transaction_retries for all shards
......................................................................


labsdb: set innodb_locks_unsafe_for_binlog for s4-5, set high 
slave_transaction_retries for all shards

Change-Id: Ia1724e62f4a9ca8d711dc03487f99edfc4390ed7
---
M manifests/site.pp
M modules/mysql_multi_instance/manifests/instance.pp
2 files changed, 15 insertions(+), 0 deletions(-)

Approvals:
  Asher: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/site.pp b/manifests/site.pp
index 1e12496..144e38d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1231,6 +1231,7 @@
                                'ram' => "151G",
                                'innodb_locks_unsafe_for_binlog' => true,
                                'repl_ignore_dbs' => 'mysql',
+                               'slave_transaction_retries' => 100000,
                                'read_only' => 0,
                        },
                }
@@ -1246,20 +1247,25 @@
                                'ram' => "48G",
                                'innodb_locks_unsafe_for_binlog' => true,
                                'repl_ignore_dbs' => 'mysql',
+                               'slave_transaction_retries' => 100000,
                                'read_only' => 0,
                        },
                        's4' => {
                                'port' => 3307,
                                'innodb_log_file_size' => "2000M",
                                'ram' => "48G",
+                               'innodb_locks_unsafe_for_binlog' => true,
                                'repl_ignore_dbs' => 'mysql',
+                               'slave_transaction_retries' => 100000,
                                'read_only' => 0,
                        },
                        's5' => {
                                'port' => 3308,
                                'innodb_log_file_size' => "1000M",
                                'ram' => "48G",
+                               'innodb_locks_unsafe_for_binlog' => true,
                                'repl_ignore_dbs' => 'mysql',
+                               'slave_transaction_retries' => 100000,
                                'read_only' => 0,
                        },
                }
@@ -1275,6 +1281,7 @@
                                'ram' => "48G",
                                'innodb_locks_unsafe_for_binlog' => true,
                                'repl_ignore_dbs' => 'mysql',
+                               'slave_transaction_retries' => 100000,
                                'read_only' => 0,
                        },
                        's6' => {
@@ -1283,6 +1290,7 @@
                                'ram' => "48G",
                                'innodb_locks_unsafe_for_binlog' => true,
                                'repl_ignore_dbs' => 'mysql',
+                               'slave_transaction_retries' => 100000,
                                'read_only' => 0,
                        },
                        's7' => {
@@ -1291,6 +1299,7 @@
                                'ram' => "48G",
                                'innodb_locks_unsafe_for_binlog' => true,
                                'repl_ignore_dbs' => 'mysql',
+                               'slave_transaction_retries' => 100000,
                                'read_only' => 0,
                        },
                }
diff --git a/modules/mysql_multi_instance/manifests/instance.pp 
b/modules/mysql_multi_instance/manifests/instance.pp
index cb065c7..65d02e4 100644
--- a/modules/mysql_multi_instance/manifests/instance.pp
+++ b/modules/mysql_multi_instance/manifests/instance.pp
@@ -34,6 +34,11 @@
     }else {
       $innodb_locks_unsafe_for_binlog = false
     }
+    if has_key( $instances[$name],  'slave_transaction_retries') {
+      $slave_transaction_retries = 
$instances[$name]['slave_transaction_retries']
+    }else {
+      $slave_transaction_retries = 10
+    }
 
     $serverid = inline_template("<%= ia = ipaddress.split('.'); server_id = 
ia[0] + ia[2] + ia[3] + String($port); server_id %>")
     include passwords::nagios::mysql
@@ -139,6 +144,7 @@
           'optimizer_switch'            => 
'\'mrr=on,mrr_cost_based=on,mrr_sort_keys=on,optimize_join_buffer_size=on,extended_keys=off\'',
           'replicate-ignore-db'         => $repl_ignore_dbs,
           'replicate-wild-ignore-table' => $repl_wild_ignore_tables,
+          'slave_transaction_retries'   => $slave_transaction_retries,
         },
         'mysqldump' => {
           'quick'              => true,

-- 
To view, visit https://gerrit.wikimedia.org/r/68602
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1724e62f4a9ca8d711dc03487f99edfc4390ed7
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher <afeld...@wikimedia.org>
Gerrit-Reviewer: Asher <afeld...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits