Jcrespo has uploaded a new change for review. https://gerrit.wikimedia.org/r/265490
Change subject: Modifying parsercache including latest optimizations and options ...................................................................... Modifying parsercache including latest optimizations and options SSL, native io, p_s, etc. Change-Id: I545c952c0b62be85d4927378ce350a7e642c790e --- M templates/mariadb/parsercache.my.cnf.erb 1 file changed, 46 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/90/265490/1 diff --git a/templates/mariadb/parsercache.my.cnf.erb b/templates/mariadb/parsercache.my.cnf.erb index 165cb21..c964784 100644 --- a/templates/mariadb/parsercache.my.cnf.erb +++ b/templates/mariadb/parsercache.my.cnf.erb @@ -4,6 +4,15 @@ [client] port = 3306 socket = /tmp/mysql.sock +<% if @ssl == 'on' %> +# ssl +ssl-ca=/etc/mysql/ssl/cacert.pem +ssl-cert=/etc/mysql/ssl/server-cert.pem +ssl-key=/etc/mysql/ssl/server-key.pem +# skip server cert validation until we generate one cert per server +# it would check the cert's common name against the host +# ssl-verify-server-cert +<% end %> [mysqld] @@ -31,12 +40,11 @@ back_log = 500 extra_max_connections = 10 max_connect_errors = 1000000000 -max_allowed_packet = 16M +max_allowed_packet = 32M connect_timeout = 3 query_cache_size = 0 query_cache_type = 0 event_scheduler = 1 -userstat = 1 # we are testing impact of performance schema performance_schema = 1 @@ -77,8 +85,6 @@ innodb_flush_method = O_DIRECT innodb_thread_concurrency = 0 innodb_io_capacity = 20000 -innodb_read_io_threads = 16 -innodb_write_io_threads = 8 innodb_stats_sample_pages = 16 innodb_stats_method = nulls_unequal aria_pagecache_buffer_size = 1G @@ -87,16 +93,50 @@ # 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 %> +<% if @ssl == 'on' %> +# ssl +ssl-ca=/etc/mysql/ssl/cacert.pem +ssl-cert=/etc/mysql/ssl/server-cert.pem +ssl-key=/etc/mysql/ssl/server-key.pem +ssl-cipher=TLSv1.2 +<% end %> +<% if @p_s == 'on' %> +# Enabling performance_schema (disabled by default in MariaDB10) +performance_schema = 1 +# downsizing performance schema memory usage: T99485 +performance_schema_digests_size = -1 +performance_schema_max_thread_instances = 500 +performance_schema_max_cond_instances = 1000 +performance_schema_accounts_size = 300 +performance_schema_hosts_size = 300 +performance_schema_events_statements_history_size = 10 +performance_schema_events_statements_history_long_size = 1000 +performance_schema_events_waits_history_size = 10 +performance_schema_events_waits_history_long_size = 1000 +performance_schema_events_stages_history_size = 10 +performance_schema_events_stages_history_long_size = 1000 +performance_schema_max_mutex_instances = 5000 +performance_schema_max_rwlock_instances = 2000 +performance_schema_max_socket_instances = 500 +performance_schema_max_table_instances = 1000 +<% else %> +# only enable userstat if p_s is disabled +performance_schema = 0 +userstat = 1 +<% end %> optimizer_switch = 'mrr=on,mrr_cost_based=on,mrr_sort_keys=on,optimize_join_buffer_size=on' [mysqldump] quick -max_allowed_packet = 16M +max_allowed_packet = 32M #!includedir /etc/mysql/conf.d/ -- To view, visit https://gerrit.wikimedia.org/r/265490 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I545c952c0b62be85d4927378ce350a7e642c790e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Jcrespo <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
