From ff506142ce1e664a332bd3cbc8da4aab410faea4 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Wed, 4 Sep 2019 18:33:13 +0200 Subject: [PATCH] MariaDB optimization based on template --- wo/cli/plugins/stack_pref.py | 104 ++++--------------- wo/cli/templates/my.mustache | 195 +++++++++++++++++++++++++++++++++++ 2 files changed, 214 insertions(+), 85 deletions(-) create mode 100644 wo/cli/templates/my.mustache diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py index 2227765..a0f3def 100644 --- a/wo/cli/plugins/stack_pref.py +++ b/wo/cli/plugins/stack_pref.py @@ -886,101 +886,35 @@ def post_pref(self, apt_packages, packages, upgrade=False): encoding='utf-8', mode='w') config_file.write(config) config_file.close() - elif (not WOFileUtils.grep(self, "/etc/mysql/my.cnf", "WordOps")): + else: Log.info(self, "Tuning MariaDB configuration") - with open("/etc/mysql/my.cnf", - "a") as mysql_file: - mysql_file.write("\n# WordOps v3.9.8\n") + WOFileUtils.copyfile(self, "/etc/mysql/my.cnf", + "/etc/mysql/my.cnf.default-pkg") wo_ram = psutil.virtual_memory().total / (1024 * 1024) # set InnoDB variable depending on the RAM available wo_ram_innodb = int(wo_ram*0.3) wo_ram_log_buffer = int(wo_ram_innodb*0.25) wo_ram_log_size = int(wo_ram_log_buffer*0.5) + if (wo_ram_innodb > 2000) and (wo_ram_innodb < 64000): + wo_innodb_instance = int(wo_ram_innodb/1000) + tmp_table_size = int(128) + elif (wo_ram_innodb < 2000): + wo_innodb_instance = int(1) + tmp_table_size = int(32) + elif (wo_ram_innodb > 64000): + wo_innodb_instance = int(64) + tmp_table_size = int(256) + data = dict( + tmp_table_size=tmp_table_size, inno_log=wo_ram_log_size, + inno_buffer=wo_ram_innodb, + inno_log_buffer=wo_ram_log_buffer, + innodb_instances=wo_innodb_instance) + WOTemplate.render( + self, '/etc/mysql/my.cnf', 'my.mustache', data) # replacing default values Log.debug(self, "Tuning MySQL configuration") # set innodb_buffer_pool_instances depending # on the amount of RAM - if (wo_ram_innodb > 1000) and (wo_ram_innodb < 64000): - wo_innodb_instance = int( - wo_ram_innodb/1000) - elif (wo_ram_innodb < 1000): - wo_innodb_instance = int(1) - elif (wo_ram_innodb > 64000): - wo_innodb_instance = int(64) - WOFileUtils.searchreplace(self, "/etc/mysql/my.cnf", - "innodb_buffer_pool_size = 256M", - "innodb_buffer_pool_size " - "= {0}M\n" - "innodb_buffer_pool_instances " - "= {1}\n" - .format(wo_ram_innodb, - wo_innodb_instance)) - WOFileUtils.searchreplace(self, "/etc/mysql/my.cnf", - "innodb_log_buffer_size = 8M", - "innodb_log_buffer_size = {0}M" - .format(wo_ram_log_buffer)) - WOFileUtils.searchreplace(self, "/etc/mysql/my.cnf", - "#innodb_log_file_size = 50M", - "innodb_log_file_size = {0}M" - .format(wo_ram_log_size)) - WOFileUtils.searchreplace(self, - "/etc/mysql/my.cnf", - "wait_timeout " - "= 600", - "wait_timeout " - "= 120\n" - "skip-name-resolve = 1\n") - # disabling mariadb binlog - WOFileUtils.searchreplace(self, - "/etc/mysql/my.cnf", - "log_bin " - "= /var/log/mysql/" - "mariadb-bin", - "#log_bin " - " = /var/log/" - "mysql/mariadb-bin") - WOFileUtils.searchreplace(self, "/etc/mysql/my.cnf", - 'log_bin_index ' - "= /var/log/mysql/" - "mariadb-bin.index", - "#log_bin_index " - "= /var/log/mysql/" - "mariadb-bin.index") - WOFileUtils.searchreplace(self, "/etc/mysql/my.cnf", - "expire_logs_days = 10", - "#expire_logs_days " - "= 10") - WOFileUtils.searchreplace(self, "/etc/mysql/my.cnf", - "max_binlog_size " - "= 100M", - "#max_binlog_size " - "= 100M") - WOFileUtils.searchreplace(self, "/etc/mysql/my.cnf", - "innodb_open_files =" - " 400", - "innodb_open_files =" - " 16000") - WOFileUtils.searchreplace(self, "/etc/mysql/my.cnf", - "innodb_io_capacity =" - " 400", - "innodb_io_capacity =" - " 16000") - WOFileUtils.searchreplace(self, "/etc/mysql/my.cnf", - "query_cache_size = 64M", - "query_cache_size = 0") - WOFileUtils.searchreplace(self, "/etc/mysql/my.cnf", - "#query_cache_type = DEMAND", - "query_cache_type = 0") - WOFileUtils.searchreplace(self, "/etc/mysql/my.cnf", - "#open-files-limit = 2000", - "open-files-limit = 10000") - WOFileUtils.searchreplace(self, "/etc/mysql/my.cnf", - "table_open_cache = 400", - "table_open_cache = 16000") - WOFileUtils.searchreplace(self, "/etc/mysql/my.cnf", - "max_allowed_packet = 16M", - "max_allowed_packet = 64M\n") - WOService.stop_service(self, 'mysql') WOFileUtils.mvfile(self, '/var/lib/mysql/ib_logfile0', '/var/lib/mysql/ib_logfile0.bak') diff --git a/wo/cli/templates/my.mustache b/wo/cli/templates/my.mustache new file mode 100644 index 0000000..5fec5ca --- /dev/null +++ b/wo/cli/templates/my.mustache @@ -0,0 +1,195 @@ +# MariaDB database server configuration file. +# +# You can copy this file to one of: +# - "/etc/mysql/my.cnf" to set global options, +# - "~/.my.cnf" to set user-specific options. +# +# One can use all long options that the program supports. +# Run program with --help to get a list of available options and with +# --print-defaults to see which it would actually understand and use. +# +# For explanations see +# http://dev.mysql.com/doc/mysql/en/server-system-variables.html + +# This will be passed to all mysql clients +# It has been reported that passwords should be enclosed with ticks/quotes +# escpecially if they contain "#" chars... +# Remember to edit /etc/mysql/debian.cnf when changing the socket location. +[client] +port = 3306 +socket = /var/run/mysqld/mysqld.sock + +# Here is entries for some specific programs +# The following values assume you have at least 32M ram + +# This was formally known as [safe_mysqld]. Both versions are currently parsed. +[mysqld_safe] +socket = /var/run/mysqld/mysqld.sock +nice = 0 + +[mysqld] +# +# * Basic Settings +# +user = mysql +pid-file = /var/run/mysqld/mysqld.pid +socket = /var/run/mysqld/mysqld.sock +port = 3306 +basedir = /usr +datadir = /var/lib/mysql +tmpdir = /tmp +lc_messages_dir = /usr/share/mysql +lc_messages = en_US +skip-external-locking +skip-name-resolve = 1 +# +# Instead of skip-networking the default is now to listen only on +# localhost which is more compatible and is not less secure. +bind-address = ::ffff:127.0.0.1 +# +# * Fine Tuning +# +max_connections = 100 +connect_timeout = 5 +wait_timeout = 60 +max_allowed_packet = 64M +thread_cache_size = 128 +sort_buffer_size = 4M +bulk_insert_buffer_size = 16M +tmp_table_size = {{tmp_table_size}}M +max_heap_table_size = {{tmp_table_size}}M +# +# * MyISAM +# +# This replaces the startup script and checks MyISAM tables if needed +# the first time they are touched. On error, make copy and try a repair. +myisam_recover_options = BACKUP +key_buffer_size = 128M +open-files-limit = 500000 +table_open_cache = 16000 +myisam_sort_buffer_size = 512M +concurrent_insert = 2 +read_buffer_size = 2M +read_rnd_buffer_size = 1M +# +# * Query Cache Configuration +# +# Cache only tiny result sets, so we can fit more in the query cache. +query_cache_limit = 128K +query_cache_size = 0 +# for more write intensive setups, set to DEMAND or OFF +query_cache_type = 0 +# +# * Logging and Replication +# +# Both location gets rotated by the cronjob. +# Be aware that this log type is a performance killer. +# As of 5.1 you can enable the log at runtime! +#general_log_file = /var/log/mysql/mysql.log +#general_log = 1 +# +# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf. +# +# we do want to know about network errors and such +log_warnings = 2 +# +# Enable the slow query log to see queries with especially long duration +slow_query_log = 1 +slow_query_log_file = /var/log/mysql/mariadb-slow.log +long_query_time = 10 +#log_slow_rate_limit = 1000 +log_slow_verbosity = query_plan + +#log-queries-not-using-indexes +#log_slow_admin_statements +# +# The following can be used as easy to replay backup logs or for replication. +# note: if you are setting up a replication slave, see README.Debian about +# other settings you may need to change. +#server-id = 1 +#report_host = master1 +#auto_increment_increment = 2 +#auto_increment_offset = 1 +#log_bin = /var/log/mysql/mariadb-bin +#log_bin_index = /var/log/mysql/mariadb-bin.index +# not fab for performance, but safer +#sync_binlog = 1 +#expire_logs_days = 10 +#max_binlog_size = 100M +transaction_isolation = READ-COMMITTED +binlog_format = ROW + +# slaves +#relay_log = /var/log/mysql/relay-bin +#relay_log_index = /var/log/mysql/relay-bin.index +#relay_log_info_file = /var/log/mysql/relay-bin.info +#log_slave_updates +#read_only +# +# If applications support it, this stricter sql_mode prevents some +# mistakes like inserting invalid dates etc. +#sql_mode = NO_ENGINE_SUBSTITUTION,TRADITIONAL +# +# * InnoDB +# +# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/. +# Read the manual for more InnoDB related options. There are many! +default_storage_engine = InnoDB +# you can't just change log file size, requires special procedure +innodb_log_file_size = {{inno_log}}M +innodb_buffer_pool_size = {{inno_buffer}}M +innodb_log_buffer_size = {{inno_log_buffer}}M +innodb_file_per_table = 1 +innodb_open_files = 500000 +innodb_io_capacity = 500000 +innodb_flush_method = O_DIRECT +innodb_buffer_pool_instances = {{innodb_instances}} +# +# * Security Features +# +# Read the manual, too, if you want chroot! +# chroot = /var/lib/mysql/ +# +# For generating SSL certificates I recommend the OpenSSL GUI "tinyca". +# +# ssl-ca=/etc/mysql/cacert.pem +# ssl-cert=/etc/mysql/server-cert.pem +# ssl-key=/etc/mysql/server-key.pem + +# +# * Galera-related settings +# +[galera] +# Mandatory settings +#wsrep_on=ON +#wsrep_provider= +#wsrep_cluster_address= +#binlog_format=row +#default_storage_engine=InnoDB +#innodb_autoinc_lock_mode=2 +# +# Allow server to accept connections on all interfaces. +# +#bind-address=0.0.0.0 +# +# Optional setting +#wsrep_slave_threads=1 +#innodb_flush_log_at_trx_commit=0 + +[mysqldump] +quick +quote-names +max_allowed_packet = 64M + +[mysql] +#no-auto-rehash # faster start of mysql but no tab completion + +[isamchk] +key_buffer = 16M + +# +# * IMPORTANT: Additional settings that can override those from this file! +# The files must end with '.cnf', otherwise they'll be ignored. +# +!include /etc/mysql/mariadb.cnf +!includedir /etc/mysql/conf.d/