Elukey has submitted this change and it was merged. Change subject: Puppetize the upstart logrotate script on Trusty. ......................................................................
Puppetize the upstart logrotate script on Trusty. The packaged logrotate is a bit half-assed and doesn't account for active writers to the logfile during compression. This doesn't matter much on systems with infrequent logging, but some Labs boxes with busy upstart logs are producing cron warnings during log rotation: "gzip: stdin: file size changed while zipping" This is upstream bug https://bugs.launchpad.net/ubuntu/+source/upstart/+bug/1350782 Change-Id: I855a28f7557ad1a7513ae2c66729239e53fca595 --- A modules/base/files/logrotate/upstart M modules/base/manifests/init.pp 2 files changed, 31 insertions(+), 0 deletions(-) Approvals: Elukey: Looks good to me, approved Filippo Giunchedi: Looks good to me, but someone else must approve Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/base/files/logrotate/upstart b/modules/base/files/logrotate/upstart new file mode 100644 index 0000000..a134531 --- /dev/null +++ b/modules/base/files/logrotate/upstart @@ -0,0 +1,22 @@ +##################################################################### +### THIS FILE IS MANAGED BY PUPPET +### puppet:///modules/base/logrotate/puppet +##################################################################### + +# +# This should be identical to the packaged config, with the addition +# of 'delaycompress'. If +# +# https://bugs.launchpad.net/ubuntu/+source/upstart/+bug/1350782 +# +# is ever resolved then this won't need to be puppetized anymore. +# +/var/log/upstart/*.log { + daily + missingok + rotate 7 + compress + notifempty + nocreate + delaycompress +} diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp index ad7c6da..4836ed8 100644 --- a/modules/base/manifests/init.pp +++ b/modules/base/manifests/init.pp @@ -52,4 +52,13 @@ class { 'base::monitoring::host': contact_group => $group_contact, } + + if os_version('ubuntu == trusty') { + file { '/etc/logrotate.d/upstart': + mode => '0444', + owner => 'root', + group => 'root', + source => 'puppet:///modules/base/logrotate/upstart', + } + } } -- To view, visit https://gerrit.wikimedia.org/r/313558 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I855a28f7557ad1a7513ae2c66729239e53fca595 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org> Gerrit-Reviewer: Elukey <ltosc...@wikimedia.org> Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org> Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org> Gerrit-Reviewer: Gehel <gleder...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
