ArielGlenn has submitted this change and it was merged.
Change subject: snapshots: enable the dumps from cron as opposed to just
deploying the script
......................................................................
snapshots: enable the dumps from cron as opposed to just deploying the script
this creates the roles for the en wiki dumps ("hugewikis") and
the rest of the wikis ("regularwikis") and applies them on
the appropriate hosts.
Change-Id: I7bcc74fd79cccb5197630790b6113b5522213f08
---
M manifests/role/snapshot.pp
M manifests/site.pp
M modules/snapshot/manifests/dumps/cron/huge.pp
M modules/snapshot/manifests/dumps/cron/rest.pp
4 files changed, 19 insertions(+), 10 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/snapshot.pp b/manifests/role/snapshot.pp
index c82410a..689a43e 100644
--- a/manifests/role/snapshot.pp
+++ b/manifests/role/snapshot.pp
@@ -111,3 +111,17 @@
user => 'datasets',
}
}
+
+class role::snapshot::dumps::hugewikis {
+ include role::snapshot::common
+ class { 'snapshot::dumps::cron::huge':
+ user => 'datasets',
+ }
+}
+
+class role::snapshot::dumps::regularwikis {
+ include role::snapshot::common
+ class { 'snapshot::dumps::cron::rest':
+ user => 'datasets',
+ }
+}
diff --git a/manifests/site.pp b/manifests/site.pp
index 2a5a671..d53a838 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2473,8 +2473,7 @@
# NOTE: New snapshot hosts must also be manually added
# to modules/dataset/files/exports. One must also manually
# run `exportfs -r` on dataset1001. (T111586)
- role snapshot
- include snapshot::dumps::cron::huge
+ role snapshot, snapshot::dumps::hugewikis
include standard
}
@@ -2482,14 +2481,12 @@
# NOTE: New snapshot hosts must also be manually added
# to modules/dataset/files/exports. One must also manually
# run `exportfs -r` on dataset1001. (T111586)
- role snapshot
- include snapshot::dumps::cron::rest
+ role snapshot, snapshot::dumps::regularwikis
include standard
}
node /^snapshot1004\.eqiad\.wmnet/ {
- role snapshot, snapshot::dumps::monitor
- include snapshot::dumps::cron::rest
+ role snapshot, snapshot::dumps::monitor, snapshot::dumps::regularwikis
include standard
}
diff --git a/modules/snapshot/manifests/dumps/cron/huge.pp
b/modules/snapshot/manifests/dumps/cron/huge.pp
index 6bad717..97d5307 100644
--- a/modules/snapshot/manifests/dumps/cron/huge.pp
+++ b/modules/snapshot/manifests/dumps/cron/huge.pp
@@ -8,8 +8,7 @@
# fixme there is an implicit dependency on
# $dumpsdir/confs/wikidump.conf.* plus some stage files, make explicit
cron { 'fulldumps_huge':
- # not ready yet
- ensure => 'absent',
+ ensure => 'present',
environment => '[email protected]',
user => $user,
command => "${snapshot::dirs::dumpsdir}/fulldumps.sh 01 14
hugewikis >/dev/null",
diff --git a/modules/snapshot/manifests/dumps/cron/rest.pp
b/modules/snapshot/manifests/dumps/cron/rest.pp
index 1395070..107bfa2 100644
--- a/modules/snapshot/manifests/dumps/cron/rest.pp
+++ b/modules/snapshot/manifests/dumps/cron/rest.pp
@@ -8,8 +8,7 @@
# fixme there is an implicit dependency on
# $dumpsdir/confs/wikidump.conf.* plus some stage files, make explicit
cron { 'fulldumps_rest':
- # not ready yet
- ensure => 'absent',
+ ensure => 'present',
environment => '[email protected]',
user => $user,
command => "${snapshot::dirs::dumpsdir}/fulldumps.sh 01 14 regular
> /dev/null",
--
To view, visit https://gerrit.wikimedia.org/r/267658
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7bcc74fd79cccb5197630790b6113b5522213f08
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
