Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/64496
Change subject: log_bin should default to false
......................................................................
log_bin should default to false
Change-Id: I3f8fde297d6fb706000ddbc6d8c2b9e375cf8c38
---
M manifests/site.pp
M modules/mysql_multi_instance/manifests/instance.pp
2 files changed, 8 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/96/64496/1
diff --git a/manifests/site.pp b/manifests/site.pp
index d6080ff..e980cb1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -655,6 +655,7 @@
'innodb_log_file_size' => "2000M",
'ram' => "72G",
'repl_wild_ignore_tables' => $::private_tables,
+ 'log_bin' => true,
'binlog_format' => "row",
},
}
@@ -669,6 +670,7 @@
'innodb_log_file_size' => "2000M",
'ram' => "24G",
'repl_wild_ignore_tables' => $::private_tables,
+ 'log_bin' => true,
'binlog_format' => "row",
},
's4' => {
@@ -676,6 +678,7 @@
'innodb_log_file_size' => "2000M",
'ram' => "24G",
'repl_wild_ignore_tables' => $::private_tables,
+ 'log_bin' => true,
'binlog_format' => "row",
},
's5' => {
@@ -683,6 +686,7 @@
'innodb_log_file_size' => "1000M",
'ram' => "24G",
'repl_wild_ignore_tables' => $::private_tables,
+ 'log_bin' => true,
'binlog_format' => "row",
},
}
@@ -698,6 +702,7 @@
'ram' => "24G",
'repl_ignore_dbs' => $::private_wikis,
'repl_wild_ignore_tables' => $::private_tables,
+ 'log_bin' => true,
'binlog_format' => "row",
},
's6' => {
@@ -705,6 +710,7 @@
'innodb_log_file_size' => "500M",
'ram' => "24G",
'repl_wild_ignore_tables' => $::private_tables,
+ 'log_bin' => true,
'binlog_format' => "row",
},
's7' => {
@@ -712,6 +718,7 @@
'innodb_log_file_size' => "500M",
'ram' => "24G",
'repl_wild_ignore_tables' => $::private_tables,
+ 'log_bin' => true,
'binlog_format' => "row",
},
}
@@ -1216,7 +1223,6 @@
'port' => 3306,
'innodb_log_file_size' => "2000M",
'ram' => "151G",
- 'log_bin' => false,
'innodb_locks_unsafe_for_binlog' => true,
},
}
@@ -1230,22 +1236,17 @@
'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,
},
}
}
@@ -1258,21 +1259,18 @@
'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,
},
}
diff --git a/modules/mysql_multi_instance/manifests/instance.pp
b/modules/mysql_multi_instance/manifests/instance.pp
index 8368936..1ccfd22 100644
--- a/modules/mysql_multi_instance/manifests/instance.pp
+++ b/modules/mysql_multi_instance/manifests/instance.pp
@@ -22,7 +22,7 @@
if has_key( $instances[$name], 'log_bin') {
$log_bin = $instances[$name]['log_bin']
}else {
- $log_bin = true
+ $log_bin = false
}
if has_key( $instances[$name], 'innodb_locks_unsafe_for_binlog') {
$innodb_locks_unsafe_for_binlog =
$instances[$name]['innodb_locks_unsafe_for_binlog']
--
To view, visit https://gerrit.wikimedia.org/r/64496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f8fde297d6fb706000ddbc6d8c2b9e375cf8c38
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
