Springle has submitted this change and it was merged.
Change subject: Make dbstore non-delayed by default. Apply suitable replag
thresholds to dbstore1001 for 24h pt-slave-delay, and dbstore1002 for analytics.
......................................................................
Make dbstore non-delayed by default. Apply suitable replag thresholds
to dbstore1001 for 24h pt-slave-delay, and dbstore1002 for analytics.
Change-Id: Icb5bcf944efbcae30f2c76bf08c3d940de1ec369
---
M manifests/role/mariadb.pp
M manifests/site.pp
2 files changed, 13 insertions(+), 5 deletions(-)
Approvals:
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 935a707..b5dc285 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -86,10 +86,10 @@
include mariadb::monitor_process
}
-# MariaDB 10 delayed slaves replicating all shards
+# MariaDB 10 slaves replicating all shards
class role::mariadb::dbstore(
- $lag_warn = 90000,
- $lag_crit = 180000,
+ $lag_warn = 300,
+ $lag_crit = 600,
) {
system::role { 'role::mariadb::dbstore':
diff --git a/manifests/site.pp b/manifests/site.pp
index 65d4fd3..09447db 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -908,14 +908,22 @@
include admin
$cluster = 'mysql'
$mariadb_backups_folder = '/a/backups'
- include role::mariadb::dbstore
include role::mariadb::backup
+ # 24h pt-slave-delay on all repl streams
+ class { 'role::mariadb::dbstore':
+ lag_warn => 90000,
+ lag_crit => 180000,
+ }
}
node /^dbstore1002\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
- include role::mariadb::dbstore
+ # Analytics traffic & eventlogging spikes
+ class { 'role::mariadb::dbstore':
+ lag_warn => 1800,
+ lag_crit => 3600,
+ }
}
node 'dobson.wikimedia.org' {
--
To view, visit https://gerrit.wikimedia.org/r/138548
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icb5bcf944efbcae30f2c76bf08c3d940de1ec369
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle <[email protected]>
Gerrit-Reviewer: Springle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
