Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/179426
Change subject: More puppet-run fixes ...................................................................... More puppet-run fixes - Write apt-get's output to /dev/null as to avoid cronspam - Lower timeouts to 300/600 for apt-get & puppet respectively and 60 for kill timeout for both; should be more than enough. Change-Id: I8f8f8bdee91105b41601a0dff508a15c91a20984 --- M modules/base/files/puppet/puppet-run 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/26/179426/1 diff --git a/modules/base/files/puppet/puppet-run b/modules/base/files/puppet/puppet-run index 006ed27..2d42adc 100644 --- a/modules/base/files/puppet/puppet-run +++ b/modules/base/files/puppet/puppet-run @@ -3,18 +3,18 @@ # older versions of timeout (before coreutils) didn't support -k # remove the coditional after the last lucid host goes if timeout -k 10 10 true >/dev/null 2>&1; then - KILL_TIMEOUT="-k 300" + KILL_TIMEOUT="-k 60" fi set -e -timeout $KILL_TIMEOUT 1800 apt-get update +timeout $KILL_TIMEOUT 300 apt-get update >/dev/null 2>&1 # We pass show-diff, show the log may be sensitive, # so make sure it's sufficiently protected umask 077 -timeout $KILL_TIMEOUT 1800 puppet agent \ +timeout $KILL_TIMEOUT 600 puppet agent \ --onetime \ --no-daemonize \ --verbose \ -- To view, visit https://gerrit.wikimedia.org/r/179426 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8f8f8bdee91105b41601a0dff508a15c91a20984 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
