Faidon Liambotis has submitted this change and it was merged.
Change subject: Revert "Replicate pt-heartbeat table to labs. Stop replicating
msg_resource"
......................................................................
Revert "Replicate pt-heartbeat table to labs. Stop replicating msg_resource"
Was never puppet-merged.
This reverts commit 97cd5c5a53b062c36eae12490ffabe424b1d14a1.
Change-Id: I1dc8cdd13d82f6d0fe0e3705c6c4eafc20cedf44
---
M manifests/realm.pp
M templates/mariadb/labs.my.cnf.erb
M templates/mariadb/sanitarium.my.cnf.erb
3 files changed, 3 insertions(+), 23 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/realm.pp b/manifests/realm.pp
index 6cfbddf..b7ba9c4 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -142,7 +142,6 @@
'migrateuser_medium',
'moodbar_feedback',
'moodbar_feedback_response',
- 'msg_resource',
'objectcache',
'old_growth',
'oldimage_old',
diff --git a/templates/mariadb/labs.my.cnf.erb
b/templates/mariadb/labs.my.cnf.erb
index 453141c..a837355 100644
--- a/templates/mariadb/labs.my.cnf.erb
+++ b/templates/mariadb/labs.my.cnf.erb
@@ -76,32 +76,25 @@
s1.replicate-wild-do-table = %wik%.%
s1.replicate-wild-do-table = information_schema_p.%
-s1.replicate-wild-do-table = heartbeat.%
s2.replicate-wild-do-table = %wik%.%
s2.replicate-wild-do-table = information_schema_p.%
-s2.replicate-wild-do-table = heartbeat.%
s3.replicate-wild-do-table = %wik%.%
s3.replicate-wild-do-table = information_schema_p.%
-s3.replicate-wild-do-table = heartbeat.%
s4.replicate-wild-do-table = %wik%.%
s4.replicate-wild-do-table = information_schema_p.%
-s4.replicate-wild-do-table = heartbeat.%
s5.replicate-wild-do-table = %wik%.%
s5.replicate-wild-do-table = information_schema_p.%
-s5.replicate-wild-do-table = heartbeat.%
s6.replicate-wild-do-table = %wik%.%
s6.replicate-wild-do-table = information_schema_p.%
-s6.replicate-wild-do-table = heartbeat.%
s7.replicate-wild-do-table = %wik%.%
s7.replicate-wild-do-table = information_schema_p.%
s7.replicate-wild-do-table = %auth%.%
-s7.replicate-wild-do-table = heartbeat.%
[mysqldump]
diff --git a/templates/mariadb/sanitarium.my.cnf.erb
b/templates/mariadb/sanitarium.my.cnf.erb
index b855ace..8e43c4c 100644
--- a/templates/mariadb/sanitarium.my.cnf.erb
+++ b/templates/mariadb/sanitarium.my.cnf.erb
@@ -17,7 +17,7 @@
max_connections = 100
max_connect_errors = 1000000000
-max_allowed_packet = 32M
+max_allowed_packet = 16M
connect_timeout = 3
query_cache_size = 0
query_cache_type = 0
@@ -57,23 +57,11 @@
tokudb_pk_insert_mode = 2
join_cache_level = 8
-# dump and load innodb buffer at start and stop
-innodb_buffer_pool_load_at_startup = 1
-innodb_buffer_pool_dump_at_shutdown = 1
-
-<% if @kernelversion < "3.19" %>
-# Until kernel 3.16 http://www.spinics.net/lists/stable/msg61873.html
-# At least, I think so. For now we need to avoid the an assertion failure on
-# Trusty w/ 3.13
-innodb_use_native_aio = 0
-innodb_read_io_threads = 16
-innodb_write_io_threads = 8
-<% end %>
-
# index_condition_pushdown=off https://github.com/Tokutek/mariadb-5.5/issues/39
optimizer_switch =
'mrr=on,mrr_cost_based=on,mrr_sort_keys=on,optimize_join_buffer_size=on,engine_condition_pushdown=on,index_condition_pushdown=off'
replicate-wild-ignore-table = mysql.%
+replicate-wild-ignore-table = heartbeat.%
replicate-wild-ignore-table = oai.%
<% scope.lookupvar("::private_wikis").each do |name| -%>
@@ -169,4 +157,4 @@
[mysqldump]
quick
-max_allowed_packet = 32M
+max_allowed_packet = 16M
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/249111
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1dc8cdd13d82f6d0fe0e3705c6c4eafc20cedf44
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
