Marostegui has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404323 )
Change subject: mariadb: Set as spares labsdb1001 and labsdb1003
......................................................................
mariadb: Set as spares labsdb1001 and labsdb1003
Also removing rests of old labsdb role.
Bug: T184832
Change-Id: I8195d0448c9fba17a6f8d954c01bd0eee98f465a
---
M manifests/site.pp
D modules/role/manifests/mariadb/labs_deprecated.pp
D modules/role/templates/mariadb/mysqld_config/labs.my.cnf.erb
3 files changed, 5 insertions(+), 192 deletions(-)
Approvals:
Marostegui: Looks good to me, approved
Rush: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index ce280c2..d42c43d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1165,11 +1165,6 @@
}
## labsdb dbs
-node /labsdb100[13]\.eqiad\.wmnet/ {
- # this role is depecated and its nodes scheduled for decom
- role(mariadb::labs_deprecated)
-}
-
node /labsdb10(09|10|11)\.eqiad\.wmnet/ {
role(labs::db::replica)
}
@@ -1191,6 +1186,11 @@
role(osm::master)
}
+# old labsdbs, to be decommed. T142807
+node /labsdb100[13]\.eqiad\.wmnet/ {
+ role(spare::system)
+}
+
node /labstore100[12]\.eqiad\.wmnet/ {
# soon to be recommissioned in T158196
include ::standard
diff --git a/modules/role/manifests/mariadb/labs_deprecated.pp
b/modules/role/manifests/mariadb/labs_deprecated.pp
deleted file mode 100644
index b943b21..0000000
--- a/modules/role/manifests/mariadb/labs_deprecated.pp
+++ /dev/null
@@ -1,57 +0,0 @@
-# MariaDB 10 labsdb multiple-shards slave.
-# This role is deprecated but still in use.
-# Use role::labs::db::replica instead
-class role::mariadb::labs_deprecated {
-
- system::role { 'mariadb::labs_deprecated':
- description => 'Labs DB Slave (deprecated role)',
- }
-
- include ::standard
- include ::profile::mariadb::monitor
- include passwords::misc::scripts
- include role::mariadb::ferm
- include ::profile::base::firewall
- include role::labs::db::common
- include role::labs::db::views
- include role::labs::db::check_private_data
-
- class { 'profile::mariadb::monitor::prometheus':
- mysql_group => 'labs',
- mysql_role => 'slave',
- socket => '/tmp/mysql.sock',
- }
-
- include mariadb::packages_wmf
- include mariadb::service
-
- class { 'mariadb::config':
- config => 'role/mariadb/mysqld_config/labs.my.cnf.erb',
- datadir => '/srv/sqldata',
- tmpdir => '/srv/tmp',
- }
-
- file { '/srv/innodb':
- ensure => directory,
- owner => 'mysql',
- group => 'mysql',
- mode => '0755',
- }
-
- file { '/srv/tokudb':
- ensure => directory,
- owner => 'mysql',
- group => 'mysql',
- mode => '0755',
- }
-
- # Required for TokuDB to start
- # See
https://mariadb.com/kb/en/mariadb/enabling-tokudb/#check-for-transparent-hugepage-support-on-linux
- sysfs::parameters { 'disable-transparent-hugepages':
- values => {
- 'kernel/mm/transparent_hugepage/enabled' => 'never',
- 'kernel/mm/transparent_hugepage/defrag' => 'never',
- }
- }
-}
-
diff --git a/modules/role/templates/mariadb/mysqld_config/labs.my.cnf.erb
b/modules/role/templates/mariadb/mysqld_config/labs.my.cnf.erb
deleted file mode 100644
index c187937..0000000
--- a/modules/role/templates/mariadb/mysqld_config/labs.my.cnf.erb
+++ /dev/null
@@ -1,130 +0,0 @@
-# Labs
-
-[client]
-port = 3306
-socket = /tmp/mysql.sock
-
-[mysqld]
-
-user = mysql
-socket = /tmp/mysql.sock
-port = 3306
-basedir = <%= @basedir %>
-datadir = <%= @datadir %>
-tmpdir = <%= @tmpdir %>
-server_id = <%= @server_id %>
-
-# gtid_domain_id flag is needed for multisource replication and GTID.
-# # Strictly it is only needed on masters or servers that can potentially be
-# # masters but for consistency it should be set in all of them.
-# # https://mariadb.com/kb/en/mariadb/gtid/
-#
-gtid_domain_id = <%= @gtid_domain_id %>
-
-read_only = 0
-
-# enable socket authentication
-plugin-load = unix_socket=auth_socket.so
-
-skip-external-locking
-skip-name-resolve
-#skip-slave-start
-temp-pool
-
-secure_file_priv = /dev/null
-max_connections = 1000
-max_connect_errors = 1000000000
-max_allowed_packet = 32M
-connect_timeout = 3
-query_cache_size = 0
-query_cache_type = 0
-event_scheduler = 1
-userstat = 1
-log-warnings = 0
-thread_stack = 192K
-thread_cache_size = 300
-interactive_timeout = 28800
-wait_timeout = 3600
-plugin-load = ha_tokudb
-transaction-isolation = READ-COMMITTED
-slave_transaction_retries = 4294967295
-#slave_parallel_threads = 8
-#slave_parallel_max_queued = 16M
-sql-mode = IGNORE_BAD_TABLE_OPTIONS
-tmp_table_size = 64M
-max_heap_table_size = 64M
-
-# Needed when using ROW based replication and altering the width of a column,
if not set, the ALTER will fail
-#
https://dev.mysql.com/doc/mysql-replication-excerpt/5.7/en/replication-features-different-data-types.html
-# T73563#3117924
-slave_type_conversions = ALL_NON_LOSSY
-
-table_open_cache = 10000
-table_definition_cache = 50000
-open-files-limit = 400000
-character_set_server = binary
-character_set_filesystem = binary
-collation_server = binary
-
-default-storage-engine = InnoDB
-aria_pagecache_buffer_size = <%= (Float(@memorysize.split[0]) *
0.05).round %>G
-innodb_data_home_dir = /srv/innodb
-innodb_file_per_table = 0
-innodb_buffer_pool_size = <%= (Float(@memorysize.split[0]) *
0.25).round %>G
-innodb_log_file_size = 2G
-innodb_flush_log_at_trx_commit = 1
-innodb_flush_method = O_DIRECT
-innodb_thread_concurrency = 0
-innodb_io_capacity = 1000
-innodb_read_io_threads = 16
-innodb_write_io_threads = 8
-innodb_stats_sample_pages = 16
-innodb_stats_method = nulls_unequal
-innodb_locks_unsafe_for_binlog = 1
-innodb_file_format = barracuda
-tokudb_data_dir = /srv/tokudb
-tokudb_cache_size = <%= (Float(@memorysize.split[0]) *
0.50).round %>G
-tokudb_lock_timeout = 50000
-tokudb_empty_scan = disabled
-tokudb_read_buf_size = 256K
-tokudb_pk_insert_mode = 2
-join_cache_level = 2
-
-# 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'
-
-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]
-
-quick
-max_allowed_packet = 32M
-
-#!includedir /etc/mysql/conf.d/
--
To view, visit https://gerrit.wikimedia.org/r/404323
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8195d0448c9fba17a6f8d954c01bd0eee98f465a
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Marostegui <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
