From f590915e0e868f0566caaa01b1dc5767234bb37f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavi=20Lle=C3=B3=20Tom=C3=A1s?= Date: Wed, 22 Jan 2025 13:04:37 +0100 Subject: [PATCH] refs #8414 - Reorder files --- roles/services/files/test/z90-vn.cnf | 100 ------------------ roles/services/files/test/z92-testing.cnf | 3 - roles/services/files/test/z99-local.cnf | 6 -- roles/services/files/z90-vn.cnf | 21 ---- roles/services/files/z92-testing.cnf | 14 +++ roles/services/files/z95-production.cnf | 23 ++++ .../{files => templates}/z99-local.cnf | 0 7 files changed, 37 insertions(+), 130 deletions(-) delete mode 100644 roles/services/files/test/z90-vn.cnf delete mode 100644 roles/services/files/test/z92-testing.cnf delete mode 100644 roles/services/files/test/z99-local.cnf create mode 100644 roles/services/files/z92-testing.cnf rename roles/services/{files => templates}/z99-local.cnf (100%) diff --git a/roles/services/files/test/z90-vn.cnf b/roles/services/files/test/z90-vn.cnf deleted file mode 100644 index b705a22..0000000 --- a/roles/services/files/test/z90-vn.cnf +++ /dev/null @@ -1,100 +0,0 @@ -[mysqld] -# Docs: https://mariadb.com/kb/en/server-system-variables - -lc_messages = es_ES -lc_time_names = es_ES -character-set-server = utf8 -collation-server = utf8_unicode_ci -explicit_defaults_for_timestamp = ON -datadir = /mnt/mysqldata/ -tmpdir = /mnt/mysqltmp - -#++++++++++++++++++++++++++++++++++++++++ Binary log - -log-bin = bin.log -max_binlog_size = 1GB -binlog_cache_size = 16M -binlog_stmt_cache_size = 16M -expire_logs_days = 1 -binlog_row_image = noblob -binlog_format = row -relay_log = mysqld-relay-bin - -#++++++++++++++++++++++++++++++++++++++++ Threads - -max_connections = 1000 -thread_stack = 512K -join_buffer_size = 2M -sort_buffer_size = 4M -net_buffer_length = 256K -max_allowed_packet = 16M -read_buffer_size = 1M -read_rnd_buffer_size = 512K - -#++++++++++++++++++++++++++++++++++++++++ Performance - -thread_cache_size = 450 -interactive_timeout = 1800 -wait_timeout = 1800 -open_files_limit = 62000 -low_priority_updates = 1 -table_open_cache = 28000 -table_definition_cache = 14000 -table_open_cache_instances = 1 -key_buffer_size = 8M -max_heap_table_size = 256M -tmp_table_size = 256M -concurrent_insert = ALWAYS -group_concat_max_len = 10000 -max_connect_errors = 50 - -#++++++++++++++++++++++++++++++++++++++++ Query cache - -query_cache_limit = 0 -query_cache_type = OFF -query_cache_size = 0 - -#++++++++++++++++++++++++++++++++++++++++ InnoDB - -transaction-isolation = READ-COMMITTED -innodb_io_capacity = 100 -innodb_io_capacity_max = 100 -innodb_monitor_enable = all -innodb_read_io_threads = 16 -innodb_write_io_threads = 16 -innodb_checksum_algorithm = crc32 -innodb_adaptive_hash_index = 0 -innodb_flush_method = O_DIRECT -innodb_log_buffer_size = 32M -innodb_log_file_size = 5G -innodb_purge_threads = 4 -innodb_buffer_pool_dump_at_shutdown = ON -innodb_buffer_pool_load_at_startup = ON - -#++++++++++++++++++++++++++++++++++++++++ SSL - -ssl-ca = /etc/mysql/ca.pem -ssl-cert = /etc/mysql/cert.pem -ssl-key = /etc/mysql/key.pem - -#++++++++++++++++++++++++++++++++++++++++ Logging - -log_error = /var/log/mysql/error.log -log_warnings = 2 -log_output = TABLE -general_log = OFF -slow_query_log = ON -long_query_time = 2 -min_examined_row_limit = 0 -log_slow_admin_statements = ON -log_queries_not_using_indexes = OFF -max_error_count = 100 - -#++++++++++++++++++++++++++++++++++++++++ Performance Schema - -performance_schema = ON -performance_schema_digests_size = 20000 -performance-schema-consumer-events-statements-history = ON -performance_schema_consumer_events_statements_history_long = ON -#query_response_time_stats = ON -userstat = ON diff --git a/roles/services/files/test/z92-testing.cnf b/roles/services/files/test/z92-testing.cnf deleted file mode 100644 index 8dcb444..0000000 --- a/roles/services/files/test/z92-testing.cnf +++ /dev/null @@ -1,3 +0,0 @@ -[mysqld] - -event-scheduler = OFF diff --git a/roles/services/files/test/z99-local.cnf b/roles/services/files/test/z99-local.cnf deleted file mode 100644 index 44eea3c..0000000 --- a/roles/services/files/test/z99-local.cnf +++ /dev/null @@ -1,6 +0,0 @@ -[mysqld] - -server-id = 1 -port = 3307 -bind-address = 0.0.0.0 -innodb_buffer_pool_size = 18G diff --git a/roles/services/files/z90-vn.cnf b/roles/services/files/z90-vn.cnf index 0f6a716..b6b244b 100644 --- a/roles/services/files/z90-vn.cnf +++ b/roles/services/files/z90-vn.cnf @@ -42,30 +42,11 @@ max_connect_errors = 50 #++++++++++++++++++++++++++++++++++++++++ Binary log -log-bin = /mnt/mysqlbin/binlog/bin.log max_binlog_size = 1GB binlog_cache_size = 16M binlog_stmt_cache_size = 16M binlog_row_image = noblob binlog_format = row -relay_log = /mnt/mysqlbin/binlog/relay.log - -binlog-ignore-db = tmp -binlog-ignore-db = PERCONA_SCHEMA - -#++++++++++++++++++++++++++++++++++++++++ Replication - -event-scheduler = ON -slave_exec_mode = STRICT - -replicate-ignore-db = tmp -replicate-ignore-table = util.eventLog -replicate-ignore-table = cache.cache_calc -replicate-ignore-table = cache.available -replicate-ignore-table = cache.availableNoRaids -replicate-ignore-table = cache.cache_valid -replicate-ignore-table = cache.stock -replicate-ignore-table = cache.visible #++++++++++++++++++++++++++++++++++++++++ InnoDB @@ -80,7 +61,6 @@ innodb_checksum_algorithm = crc32 innodb_adaptive_hash_index = 0 innodb_flush_method = O_DIRECT innodb_log_buffer_size = 32M -innodb_log_file_size = 8G innodb_purge_threads = 4 innodb_buffer_pool_dump_at_shutdown = ON innodb_buffer_pool_load_at_startup = ON @@ -88,7 +68,6 @@ innodb_buffer_pool_load_at_startup = ON #++++++++++++++++++++++++++++++++++++++++ Logging log_error = /var/log/mysql/error.log -log_warnings = 1 log_output = TABLE general_log = OFF slow_query_log = ON diff --git a/roles/services/files/z92-testing.cnf b/roles/services/files/z92-testing.cnf new file mode 100644 index 0000000..e37ef52 --- /dev/null +++ b/roles/services/files/z92-testing.cnf @@ -0,0 +1,14 @@ +[mysqld] + +port = 3307 +bind-address = 0.0.0.0 +innodb_buffer_pool_size = 18G +event-scheduler = OFF +innodb_log_file_size = 5G +log_warnings = 2 + +#++++++++++++++++++++++++++++++++++++++++ Binary log + +log-bin = bin.log +expire_logs_days = 1 +relay_log = mysqld-relay-bin diff --git a/roles/services/files/z95-production.cnf b/roles/services/files/z95-production.cnf index 17f9732..0861a85 100644 --- a/roles/services/files/z95-production.cnf +++ b/roles/services/files/z95-production.cnf @@ -1,6 +1,29 @@ [mysqld] port = 3306 +innodb_log_file_size = 8G +log_warnings = 1 + +#++++++++++++++++++++++++++++++++++++++++ Binary log + +log-bin = /mnt/mysqlbin/binlog/bin.log max_connections = 1000 expire_logs_days = 7 innodb_buffer_pool_size = 64G +relay_log = /mnt/mysqlbin/binlog/relay.log +binlog-ignore-db = tmp +binlog-ignore-db = PERCONA_SCHEMA + +#++++++++++++++++++++++++++++++++++++++++ Replication + +event-scheduler = ON +slave_exec_mode = STRICT + +replicate-ignore-db = tmp +replicate-ignore-table = util.eventLog +replicate-ignore-table = cache.cache_calc +replicate-ignore-table = cache.available +replicate-ignore-table = cache.availableNoRaids +replicate-ignore-table = cache.cache_valid +replicate-ignore-table = cache.stock +replicate-ignore-table = cache.visible diff --git a/roles/services/files/z99-local.cnf b/roles/services/templates/z99-local.cnf similarity index 100% rename from roles/services/files/z99-local.cnf rename to roles/services/templates/z99-local.cnf