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..000
--- 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..000
--- 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 = 10
-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
-
