RobH has submitted this change and it was merged.
Change subject: [cirrus maint] redirect stderr to log and use full mwscript path
......................................................................
[cirrus maint] redirect stderr to log and use full mwscript path
The log files from this command are generated, but not populated with
anything. Likely they are empty because stderr was not also redirected
to the log files. Best guess for why nothing is running is that the full
path to mwscript should be use. If not the case it still doesn't hurt
to be explicit
Bug: T120843
Change-Id: I2247ae6b12b7dcf4b38d7104cbafa31960a0a6b3
---
M modules/mediawiki/manifests/maintenance/cirrussearch.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Gehel: Looks good to me, but someone else must approve
Alex Monk: Looks good to me, but someone else must approve
RobH: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/manifests/maintenance/cirrussearch.pp
b/modules/mediawiki/manifests/maintenance/cirrussearch.pp
index 41ff559..bb55fce 100644
--- a/modules/mediawiki/manifests/maintenance/cirrussearch.pp
+++ b/modules/mediawiki/manifests/maintenance/cirrussearch.pp
@@ -12,7 +12,7 @@
minute => 20,
hour => 0,
weekday => 2,
- command => '/usr/local/bin/expanddblist all | xargs -I{} -P 4 sh -c
\'mwscript extensions/CirrusSearch/maintenance/updateSuggesterIndex.php
--wiki={} --masterTimeout=10m --cluster=eqiad --optimize >
/var/log/mediawiki/cirrus-suggest/{}.eqiad.log || true\''
+ command => '/usr/local/bin/expanddblist all | xargs -I{} -P 4 sh -c
\'/usr/local/bin/mwscript
extensions/CirrusSearch/maintenance/updateSuggesterIndex.php --wiki={}
--masterTimeout=10m --cluster=eqiad --optimize >
/var/log/mediawiki/cirrus-suggest/{}.eqiad.log 2>&1 || true\''
}
cron { 'cirrus_build_completion_indices_codfw':
@@ -21,7 +21,7 @@
minute => 20,
hour => 0,
weekday => 2,
- command => '/usr/local/bin/expanddblist all | xargs -I{} -P 4 sh -c
\'mwscript extensions/CirrusSearch/maintenance/updateSuggesterIndex.php
--wiki={} --masterTimeout=10m --cluster=codfw --optimize >
/var/log/mediawiki/cirrus-suggest/{}.codfw.log || true\''
+ command => '/usr/local/bin/expanddblist all | xargs -I{} -P 4 sh -c
\'/usr/local/bin/mwscript
extensions/CirrusSearch/maintenance/updateSuggesterIndex.php --wiki={}
--masterTimeout=10m --cluster=codfw --optimize >
/var/log/mediawiki/cirrus-suggest/{}.codfw.log 2>&1 || true\''
}
file { '/var/log/mediawiki/cirrus-suggest':
--
To view, visit https://gerrit.wikimedia.org/r/265427
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2247ae6b12b7dcf4b38d7104cbafa31960a0a6b3
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Gehel <guillaume.leder...@gmail.com>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: RobH <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
