Jcrespo has submitted this change and it was merged.
Change subject: Replicate pt-heartbeat table to labs. Stop replicating
msg_resource
......................................................................
Replicate pt-heartbeat table to labs. Stop replicating msg_resource
The heartbeat database was filtered on sanitarium. I have applied
manually this changes to allow the pt-heartbeat table (heartbeat.
heartbeat) to reach sanitarium. I have also allowed it on labs.
I have changed other configuration changes, like increasing the
max_allowed_package, activating the buffer_pool dump feature,
and I have set msg_resource as a private table.
This requires a followup change on labs to fix the script that
creates the views on labs- creating a custom view for heartbeat
and deleting the one for msg_resource.
Bug: T116720
Bug: T71463
Change-Id: Idd65d4cc18f43a35c6d2bfa24560f3d271279724
References: T114752
---
M manifests/realm.pp
M templates/mariadb/labs.my.cnf.erb
M templates/mariadb/sanitarium.my.cnf.erb
3 files changed, 23 insertions(+), 3 deletions(-)
Approvals:
Jcrespo: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/realm.pp b/manifests/realm.pp
index b7ba9c4..6cfbddf 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -142,6 +142,7 @@
'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 a837355..453141c 100644
--- a/templates/mariadb/labs.my.cnf.erb
+++ b/templates/mariadb/labs.my.cnf.erb
@@ -76,25 +76,32 @@
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 8e43c4c..b855ace 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 = 16M
+max_allowed_packet = 32M
connect_timeout = 3
query_cache_size = 0
query_cache_type = 0
@@ -57,11 +57,23 @@
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| -%>
@@ -157,4 +169,4 @@
[mysqldump]
quick
-max_allowed_packet = 16M
\ No newline at end of file
+max_allowed_packet = 32M
--
To view, visit https://gerrit.wikimedia.org/r/249105
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idd65d4cc18f43a35c6d2bfa24560f3d271279724
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: Nuria <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
