Elukey has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/394531 )
Change subject: Set role::system::spare to db104[67]
......................................................................
Set role::system::spare to db104[67]
First step of the decommissioning process.
Bug: T156844
Change-Id: I3838a1b2859898fec79f51f01aaf644f6f556298
---
M hieradata/regex.yaml
M manifests/site.pp
D modules/role/manifests/mariadb/misc/eventlogging.pp
3 files changed, 3 insertions(+), 73 deletions(-)
Approvals:
Elukey: Looks good to me, approved
jenkins-bot: Verified
Jcrespo: Looks good to me, but someone else must approve
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 35be176..1b796db 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -219,11 +219,6 @@
__regex: !ruby/regexp /^stat1\d\d\d\.eqiad\.wmnet$/
monitor_screens: false
-# Temporarily disable notifications to allow decom: T156844
-analytics_notifications_disabled:
- __regex: !ruby/regexp /^db1046\.eqiad\.wmnet$/
- profile::base::notifications_enabled: '0'
-
# Gradual syslog-tls rollout - T136312
syslog_tls_eqiad:
__regex: !ruby/regexp
/^(analytics|aqs|conf|cp|db|dbproxy|druid|elastic|es|etcd|ganeti|kafka)1\d\d\d\.eqiad\.wmnet$/
diff --git a/manifests/site.pp b/manifests/site.pp
index 1a7bfbb..c29a3ed 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -562,7 +562,7 @@
# old eventlogging master database, will be decommed in T156844
node 'db1046.eqiad.wmnet' {
- role(mariadb::misc::eventlogging::master)
+ role(spare::system)
}
node 'db1107.eqiad.wmnet' {
@@ -571,10 +571,9 @@
# These replicas have an m4 custom replication protocol.
-# db1047 is a host about to be decommissioned
-# lint:ignore:wmf_styleguide
+# db1047 is a host about to be decommissioned (T156844)
node 'db1047.eqiad.wmnet' {
- role(mariadb::misc::eventlogging::replica)
+ role(spare::system)
}
node 'db1108.eqiad.wmnet' {
diff --git a/modules/role/manifests/mariadb/misc/eventlogging.pp
b/modules/role/manifests/mariadb/misc/eventlogging.pp
deleted file mode 100644
index 1bf80c6..0000000
--- a/modules/role/manifests/mariadb/misc/eventlogging.pp
+++ /dev/null
@@ -1,64 +0,0 @@
-# Eventlogging needs to be sandboxed by itself. It can consume resources
-# unpredictably, especially during backfilling. It also benefits greatly
-# from a setup tuned for TokuDB.
-class role::mariadb::misc::eventlogging(
- $shard = 'm4',
- $master = false,
- ) {
-
- system::role { 'mariadb::misc':
- description => 'Eventlogging Database',
- }
-
- $mysql_role = $master ? {
- true => 'master',
- false => 'slave',
- }
-
- include ::standard
- include role::mariadb::monitor::dba
- include passwords::misc::scripts
- include ::base::firewall
- include role::mariadb::ferm
-
- class {'role::mariadb::groups':
- mysql_group => 'misc',
- mysql_shard => $shard,
- mysql_role => $mysql_role,
- socket => '/tmp/mysql.sock',
- }
-
- include mariadb::packages_wmf
- include mariadb::service
-
-
- # History context: there used to be a distinction between
- # EL master and slaves, namely that only the master was not
- # in read only mode. The Analytics team removed this constraint
- # before deploying the eventlogging_cleaner script (T156933),
- # that needed to DELETE/UPDATE rows on the job database without
- # running as root for obvious reasons.
- class { 'mariadb::config':
- config => 'role/mariadb/mysqld_config/eventlogging.my.cnf.erb',
- datadir => '/srv/sqldata',
- tmpdir => '/srv/tmp',
- read_only => 0,
- ssl => 'puppet-cert',
- p_s => 'off',
- binlog_format => 'MIXED',
- }
-
- class { 'role::mariadb::grants::production':
- shard => $shard,
- prompt => "EVENTLOGGING ${shard}",
- password => $passwords::misc::scripts::mysql_root_pass,
- }
-
- class { 'mariadb::heartbeat':
- shard => $shard,
- datacenter => $::site,
- enabled => $master,
- socket => '/tmp/mysql.sock',
- }
-}
-
--
To view, visit https://gerrit.wikimedia.org/r/394531
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3838a1b2859898fec79f51f01aaf644f6f556298
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey <[email protected]>
Gerrit-Reviewer: Elukey <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: Marostegui <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
