ArielGlenn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/281997
Change subject: dumps: fix up all references to directory with config files
......................................................................
dumps: fix up all references to directory with config files
except for misc cron jobs which should not yet be touched, everything
else should use the definition in dumps::dirs and now it does
this being wrong prevented the regular dump cron from starting
Change-Id: I00386a6401b8bbdd79fe6c65675325e241afba26
---
M modules/snapshot/manifests/dumps/dirs.pp
M modules/snapshot/manifests/dumps/monitor.pp
M modules/snapshot/manifests/dumps/stagesconfig.pp
M modules/snapshot/manifests/dumps/wikiconf.pp
M modules/snapshot/templates/dumps/fulldumps.sh.erb
M modules/snapshot/templates/initscripts/dumps-monitor.systemd.erb
M modules/snapshot/templates/initscripts/dumps-monitor.upstart.erb
7 files changed, 19 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/97/281997/1
diff --git a/modules/snapshot/manifests/dumps/dirs.pp
b/modules/snapshot/manifests/dumps/dirs.pp
index 736daf2..786fc4a 100644
--- a/modules/snapshot/manifests/dumps/dirs.pp
+++ b/modules/snapshot/manifests/dumps/dirs.pp
@@ -13,10 +13,11 @@
$datadir = '/mnt/data/xmldatadumps'
$apachedir = '/srv/mediawiki'
+ $confsdir = '${dumpsdir}/confs"
- file { "${dumpsdir}/confs":
+ file { $confsdir:
ensure => 'directory',
- path => "${dumpsdir}/confs",
+ path => "$confsdir,
mode => '0755',
owner => 'root',
group => 'root',
diff --git a/modules/snapshot/manifests/dumps/monitor.pp
b/modules/snapshot/manifests/dumps/monitor.pp
index 571abb7..9e0b549 100644
--- a/modules/snapshot/manifests/dumps/monitor.pp
+++ b/modules/snapshot/manifests/dumps/monitor.pp
@@ -2,11 +2,12 @@
include snapshot::dumps::dirs
$repodir = $snapshot::dumps::dirs::repodir
+ $confsdir = $snapshot::dumps::dirs::confsdir
base::service_unit { 'dumps-monitor':
ensure => $ensure,
systemd => true,
upstart => true,
- subscribe =>
File["${snapshot::dumps::dirs::dumpsdir}/confs/wikidump.conf.monitor"],
+ subscribe => File["${confsdir}/wikidump.conf.monitor"],
}
}
diff --git a/modules/snapshot/manifests/dumps/stagesconfig.pp
b/modules/snapshot/manifests/dumps/stagesconfig.pp
index 6719863..79d9a11 100644
--- a/modules/snapshot/manifests/dumps/stagesconfig.pp
+++ b/modules/snapshot/manifests/dumps/stagesconfig.pp
@@ -3,14 +3,15 @@
) {
include snapshot::dumps::dirs
+ $confsdir = $snapshot::dumps::dirs::confsdir
$firststage_args = '--cutoff today'
- $rest_args= '--date last --onepass'
+ $rest_args = '--date last --onepass'
$wikiargs = '/bin/bash ./worker --skipdone --exclusive --log'
- $args_smallwikis = "${wikiargs} --configfile confs/wikidump.conf"
- $args_bigwikis = "${wikiargs} --configfile confs/wikidump.conf.bigwikis"
- $args_hugewikis = "${wikiargs} --configfile confs/wikidump.conf.hugewikis"
+ $args_smallwikis = "${wikiargs} --configfile ${confsdir}/wikidump.conf"
+ $args_bigwikis = "${wikiargs} --configfile
${confsdir}/wikidump.conf.bigwikis"
+ $args_hugewikis = "${wikiargs} --configfile
${confsdir}/wikidump.conf.hugewikis"
$jobs_to_skip = join(['metahistorybz2dump',
'metahistorybz2dumprecombine',
diff --git a/modules/snapshot/manifests/dumps/wikiconf.pp
b/modules/snapshot/manifests/dumps/wikiconf.pp
index dd05d2b..ab6e62d 100644
--- a/modules/snapshot/manifests/dumps/wikiconf.pp
+++ b/modules/snapshot/manifests/dumps/wikiconf.pp
@@ -4,11 +4,11 @@
) {
include snapshot::dumps::dirs
- $apachedir = $snapshot::dumps::dirs::apachedir
+ $confsdir = $snapshot::dumps::dirs::confsdir
- file { "${snapshot::dumps::dirs::dumpsdir}/confs/${title}":
+ file { "${confsdir}/${title}":
ensure => 'present',
- path => "${snapshot::dumps::dirs::dumpsdir}/confs/${title}",
+ path => "${confsdir}/${title}",
mode => '0755',
owner => 'root',
group => 'root',
diff --git a/modules/snapshot/templates/dumps/fulldumps.sh.erb
b/modules/snapshot/templates/dumps/fulldumps.sh.erb
index e9795e1..15ed4d4 100644
--- a/modules/snapshot/templates/dumps/fulldumps.sh.erb
+++ b/modules/snapshot/templates/dumps/fulldumps.sh.erb
@@ -46,7 +46,7 @@
stagesfile="$2"
showtype="$3"
- configfile="${dumpsdir}/confs/${conffile}"
+ configfile="${confsdir}/${conffile}"
lastrun=`$python dumpadmin.py -s lastrun --configfile $configfile`
show "lastrun is $lastrun for ${showtype}"
if [[ -z "$lastrun" || "$lastrun" < "$startdate_yyyymmdd" ]]; then
@@ -65,7 +65,7 @@
showtype="$3"
slots="$4"
- configfile="${dumpsdir}/confs/${conffile}"
+ configfile="${confsdir}/${conffile}"
alldone=`$python dumpadmin.py -s alldone --configfile $configfile`
show "alldone is ${alldone} for ${showtype}"
if [ -z "$alldone" ]; then
@@ -122,6 +122,8 @@
dumpsdir="<%= scope.lookupvar('snapshot::dumps::dirs::dumpsdir') %>"
repodir="<%= scope.lookupvar('snapshot::dumps::dirs::repodir') %>"
+confsdir="<%= scope.lookupvar('snapshot::dumps::dirs::confsdir') %>"
+
if [ -z "$repodir" -o ! -e "$repodir" ]; then
#fallback
repodir="/srv/dumps"
diff --git a/modules/snapshot/templates/initscripts/dumps-monitor.systemd.erb
b/modules/snapshot/templates/initscripts/dumps-monitor.systemd.erb
index 7d4fcac..bc230fe 100644
--- a/modules/snapshot/templates/initscripts/dumps-monitor.systemd.erb
+++ b/modules/snapshot/templates/initscripts/dumps-monitor.systemd.erb
@@ -9,7 +9,7 @@
[Service]
User=datasets
WorkingDirectory=<%= @repodir -%>
-ExecStart=/bin/bash <%= @repodir -%>/monitor --configfile
confs/wikidump.conf.monitor
+ExecStart=/bin/bash <%= @repodir -%>/monitor --configfile <%= @confsdir
-%>/wikidump.conf.monitor
[Install]
WantedBy=multi-user.target
diff --git a/modules/snapshot/templates/initscripts/dumps-monitor.upstart.erb
b/modules/snapshot/templates/initscripts/dumps-monitor.upstart.erb
index 4747326..ea0e2d7 100644
--- a/modules/snapshot/templates/initscripts/dumps-monitor.upstart.erb
+++ b/modules/snapshot/templates/initscripts/dumps-monitor.upstart.erb
@@ -14,4 +14,4 @@
chdir <%= @repodir -%>
-exec /bin/bash <%= @repodir -%>/monitor --configfile
confs/wikidump.conf.monitor
+exec /bin/bash <%= @repodir -%>/monitor --configfile <%= @confsdir
-%>/wikidump.conf.monitor
--
To view, visit https://gerrit.wikimedia.org/r/281997
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I00386a6401b8bbdd79fe6c65675325e241afba26
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
