Marostegui has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/351772 )
Change subject: mariadb: Get ready to decomission tempdb2001
......................................................................
mariadb: Get ready to decomission tempdb2001
tempdb2001 was a temporary host and it is no longer needed.
- Remove all the entries for the PXE boot.
- Remove it from prometheus
- Remove its exception from production my.cnf.erb as it had not as
powerful hardware it had to had special config to be able to cope with
replication.
- Remove it from partman options
- Add it as an spare system
Bug: T161712
Change-Id: I1561f95414434253424c9e594fd8f212c508cce6
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
M modules/role/files/prometheus/mysql-core_codfw.yaml
M modules/role/templates/mariadb/mysqld_config/production.my.cnf.erb
5 files changed, 3 insertions(+), 24 deletions(-)
Approvals:
Marostegui: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 884adf0..ee37308 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -662,12 +662,9 @@
}
}
-# temporary node in codfw to have redundancy #T162290
+# temporary node in codfw to be decommissioned: #T161712
node 'tempdb2001.codfw.wmnet' {
- class { '::role::mariadb::core':
- shard => 'x1',
- binlog_format => 'ROW',
- }
+ role(spare::system)
}
## m1 shard
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index 8f97513..b650688 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -79,7 +79,7 @@
aluminium|argon|chlorine|bromine|bohrium|darmstadtium|dbmonitor[12]001|dubnium|etcd100[1-6]|etherpad[12]001|fermium|hassaleh|hassium|krypton|meitnerium|mendelevium|mwdebug100[12]|mwreleases1001|nihal|nitrogen|planet[12]001|pollux|roentgenium|rutherfordium|sca[12]00[34]|seaborgium|serpens|tureis|alsafi|kraz|install[12]00[12]|ununpentium|zosma)
echo partman/flat.cfg virtual.cfg ;; \
eventlog[1-2]001|ocg100[1-2]|scb100[1-4]) echo partman/raid1.cfg ;; \
francium|tegmen) echo partman/raid10-gpt.cfg ;; \
- gerrit2001|phab1001|tempdb2001) echo
partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
+ gerrit2001|phab1001) echo partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
ganeti100[1-9]) echo partman/ganeti-raid1.cfg ;; \
ganeti200[1-9]) echo partman/ganeti.cfg ;; \
graphite100[13]) echo partman/graphite.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 3c9b350..db83fe8 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -6074,11 +6074,6 @@
fixed-address tegmen.wikimedia.org;
}
-host tempdb2001 {
- hardware ethernet 14:18:77:5B:2A:5D;
- fixed-address tempdb2001.codfw.wmnet;
-}
-
host terbium {
hardware ethernet 90:B1:1C:25:9D:72;
fixed-address terbium.eqiad.wmnet;
diff --git a/modules/role/files/prometheus/mysql-core_codfw.yaml
b/modules/role/files/prometheus/mysql-core_codfw.yaml
index 0f3b4d8..3c774f5 100644
--- a/modules/role/files/prometheus/mysql-core_codfw.yaml
+++ b/modules/role/files/prometheus/mysql-core_codfw.yaml
@@ -143,8 +143,3 @@
role: master
targets:
- db2033:9104
-- labels:
- shard: x1
- role: slave
- targets:
- - tempdb2001:9104
diff --git a/modules/role/templates/mariadb/mysqld_config/production.my.cnf.erb
b/modules/role/templates/mariadb/mysqld_config/production.my.cnf.erb
index 10ac666..8635145 100644
--- a/modules/role/templates/mariadb/mysqld_config/production.my.cnf.erb
+++ b/modules/role/templates/mariadb/mysqld_config/production.my.cnf.erb
@@ -81,11 +81,7 @@
# binary log an replication options
log-bin
log-slave-updates
-<% if @hostname == 'tempdb2001' -%>
-sync-binlog = 0
-<% else -%>
sync-binlog = 1
-<% end -%>
binlog-cache-size = 1M
max-binlog_size = 1000M
binlog-format = <%= @binlog_format %>
@@ -140,11 +136,7 @@
innodb_file_per_table = 1
innodb_buffer_pool_size = <%= (Float(@memorysize.split[0]) *
0.75).round %>G
innodb_log_file_size = 2G
-<% if @hostname == 'tempdb2001' -%>
-innodb_flush_log_at_trx_commit = 0
-<% else -%>
innodb_flush_log_at_trx_commit = 1
-<% end -%>
innodb_flush_method = O_DIRECT
innodb_thread_concurrency = 0
innodb_io_capacity = 1000
--
To view, visit https://gerrit.wikimedia.org/r/351772
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1561f95414434253424c9e594fd8f212c508cce6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui <[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
