Marostegui has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/393721 )
Change subject: mariadb: Convert db1099 to multiinstance
......................................................................
mariadb: Convert db1099 to multiinstance
db1099 will be serving as multi-instance in s1 and s8
Bug: T178359
Change-Id: I2510a3b237207fc23bfbac434e655a72d548b1b3
---
M hieradata/hosts/db1099.yaml
M manifests/site.pp
M modules/role/files/prometheus/mysql-core_eqiad.yaml
3 files changed, 9 insertions(+), 5 deletions(-)
Approvals:
Marostegui: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/hosts/db1099.yaml b/hieradata/hosts/db1099.yaml
index 8b1f532..c386892 100644
--- a/hieradata/hosts/db1099.yaml
+++ b/hieradata/hosts/db1099.yaml
@@ -1,2 +1,5 @@
-mariadb::shard: 's8'
+# Buffer pool sizes/instance enabled
+profile::mariadb::core_multiinstance::num_instances: 2
+profile::mariadb::core_multiinstance::s1: '185G'
+profile::mariadb::core_multiinstance::s8: '185G'
profile::base::notifications_enabled: '0'
diff --git a/manifests/site.pp b/manifests/site.pp
index 2b374d0..07837c4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -463,8 +463,8 @@
role(mariadb::core)
}
-# See also db1101 below
-node /^db1(063|099|104|092|087|109)\.eqiad\.wmnet/ {
+# See also db1099 and db1101 below
+node /^db1(063|104|092|087|109)\.eqiad\.wmnet/ {
role(mariadb::core)
}
@@ -480,7 +480,7 @@
}
# hosts with multiple shards
-node /^db1(097|101|103|105)\.eqiad\.wmnet/ {
+node /^db1(097|099|101|103|105)\.eqiad\.wmnet/ {
role(mariadb::core_multiinstance)
}
node /^db20(84|85|86|87|88|89|91|92)\.codfw\.wmnet/ {
diff --git a/modules/role/files/prometheus/mysql-core_eqiad.yaml
b/modules/role/files/prometheus/mysql-core_eqiad.yaml
index 5794333..edebe08 100644
--- a/modules/role/files/prometheus/mysql-core_eqiad.yaml
+++ b/modules/role/files/prometheus/mysql-core_eqiad.yaml
@@ -9,6 +9,7 @@
- db1080:9104
- db1083:9104
- db1089:9104
+ - db1099:13311
- db1105:13311
- labels:
shard: s1
@@ -121,7 +122,7 @@
- db1063:9104
- db1087:9104
- db1092:9104
- - db1099:9104
+ - db1099:13318
- db1101:13318
- db1104:9104
- db1109:9104
--
To view, visit https://gerrit.wikimedia.org/r/393721
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2510a3b237207fc23bfbac434e655a72d548b1b3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui <maroste...@wikimedia.org>
Gerrit-Reviewer: Jcrespo <jcre...@wikimedia.org>
Gerrit-Reviewer: Marostegui <maroste...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
