Merge "Make log rotation more bulletproof"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
970c424521
2
debian/fuel-misc.install
vendored
2
debian/fuel-misc.install
vendored
@ -1,2 +1,2 @@
|
||||
files/fuel-misc/haproxy-status.sh /usr/bin
|
||||
files/fuel-misc/logrotate-ubuntu /usr/bin
|
||||
files/fuel-misc/logrotate /usr/bin
|
||||
|
||||
2
debian/rules
vendored
2
debian/rules
vendored
@ -11,6 +11,6 @@ override_dh_install:
|
||||
dh_install
|
||||
mv debian/fuel-ha-utils/usr/lib/ocf/resource.d/fuel/rabbitmq debian/fuel-ha-utils/usr/lib/ocf/resource.d/fuel/rabbitmq-server
|
||||
mv debian/fuel-ha-utils/usr/lib/ocf/resource.d/fuel/heat_engine_ubuntu debian/fuel-ha-utils/usr/lib/ocf/resource.d/fuel/heat-engine
|
||||
mv debian/fuel-misc/usr/bin/logrotate-ubuntu debian/fuel-misc/usr/bin/fuel-logrotate
|
||||
mv debian/fuel-misc/usr/bin/logrotate debian/fuel-misc/usr/bin/fuel-logrotate
|
||||
rm debian/fuel-ha-utils/usr/lib/ocf/resource.d/fuel/heat_engine_centos
|
||||
|
||||
|
||||
@ -2,5 +2,4 @@ SHELL=/bin/bash
|
||||
PATH=/sbin:/bin:/usr/sbin:/usr/bin
|
||||
MAILTO=root
|
||||
HOME=/
|
||||
10,20,30,40,50 * * * * root nice ionice -c3 /etc/cron.hourly/logrotate
|
||||
|
||||
*/10 * * * * root nice ionice -c3 /usr/bin/fuel-logrotate
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
#!/bin/sh
|
||||
# managed by puppet
|
||||
#
|
||||
# Due to bug in logrotate, it always returns 0. Use grep for detect errors;
|
||||
# exit code 1 is considered a success as no errors were found.
|
||||
|
||||
if ! pgrep -x logrotate &>/dev/null; then
|
||||
nice ionice -c3 /usr/sbin/logrotate /etc/logrotate.d/fuel.nodaily >& /tmp/logrotate
|
||||
grep -q error /tmp/logrotate
|
||||
EXITVALUE=$?
|
||||
else
|
||||
/usr/bin/logger -t logrotate "WARNING another logrotate instance is already running, exiting"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ $EXITVALUE != 1 ]; then
|
||||
/usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE] (1 was expected)"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
exit 0
|
||||
@ -1,27 +0,0 @@
|
||||
#!/bin/sh
|
||||
# managed by puppet
|
||||
# Clean non existent log file entries from status file
|
||||
cd /var/lib/logrotate
|
||||
test -e status || touch status
|
||||
head -1 status > status.clean
|
||||
sed 's/"//g' status | while read logfile date
|
||||
do
|
||||
[ -e "$logfile" ] && echo "\"$logfile\" $date"
|
||||
done >> status.clean
|
||||
mv status.clean status
|
||||
test -x /usr/sbin/logrotate || exit 0
|
||||
|
||||
if ! pgrep -x logrotate &>/dev/null; then
|
||||
nice ionice -c3 /usr/sbin/logrotate /etc/logrotate.d/fuel.nodaily
|
||||
EXITVALUE=$?
|
||||
else
|
||||
/usr/bin/logger -t logrotate "WARNING another logrotate instance is already running, exiting"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ $EXITVALUE != 0 ]; then
|
||||
/usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE] (0 was expected)"
|
||||
fi
|
||||
|
||||
exit $EXITVALUE
|
||||
|
||||
@ -33,33 +33,43 @@ class openstack::logrotate (
|
||||
debug => $debug,
|
||||
}
|
||||
|
||||
# Our custom cronjob overlaps with daily schedule, so we need to address it
|
||||
exec { 'logrotate-tabooext':
|
||||
command => 'sed -i "/^include/i tabooext + .nodaily" /etc/logrotate.conf',
|
||||
path => [ '/bin', '/usr/bin' ],
|
||||
onlyif => 'test -f /etc/logrotate.conf',
|
||||
unless => 'grep -q tabooext /etc/logrotate.conf',
|
||||
# TODO(aschultz): should move these to augeas when augeas is upgraded to
|
||||
# >=1.4.0 because maxsize isn't supported until 1.4.0 which breaks everything.
|
||||
File_line {
|
||||
ensure => 'present',
|
||||
path => '/etc/logrotate.conf',
|
||||
}
|
||||
# We're using after here to place these options above the include
|
||||
# /etc/logrotate.d as file_line does not have a before option.
|
||||
file_line { 'logrotate-tabooext':
|
||||
line => 'tabooext + .nodaily',
|
||||
match => '^tabooext',
|
||||
after => '^create',
|
||||
} ->
|
||||
file_line { 'logrotate-compress':
|
||||
line => 'compress',
|
||||
match => '^compress',
|
||||
after => '^tabooext',
|
||||
} ->
|
||||
file_line { 'logrotate-delaycompress':
|
||||
line => 'delaycompress',
|
||||
match => '^delaycompress',
|
||||
after => '^compress',
|
||||
} ->
|
||||
file_line { 'logrotate-minsize':
|
||||
line => "minsize ${minsize}",
|
||||
match => '^minsize',
|
||||
after => '^delaycompress',
|
||||
} ->
|
||||
file_line { 'logrotate-maxsize':
|
||||
line => "maxsize ${maxsize}",
|
||||
match => '^maxsize',
|
||||
after => '^minsize',
|
||||
}
|
||||
|
||||
# case $::osfamily {
|
||||
# 'RedHat': {
|
||||
# file { '/usr/bin/fuel-logrotate':
|
||||
# mode => '0755',
|
||||
# source => 'puppet:///modules/openstack/logrotate',
|
||||
# }
|
||||
# }
|
||||
# 'Debian': {
|
||||
# file { '/usr/bin/fuel-logrotate':
|
||||
# mode => '0755',
|
||||
# source => 'puppet:///modules/openstack/logrotate-ubuntu',
|
||||
# }
|
||||
# }
|
||||
#}
|
||||
|
||||
cron { 'fuel-logrotate':
|
||||
command => '/usr/bin/fuel-logrotate',
|
||||
user => 'root',
|
||||
minute => '*/30',
|
||||
#require => File['/usr/bin/fuel-logrotate'],
|
||||
}
|
||||
}
|
||||
|
||||
@ -37,6 +37,9 @@
|
||||
# compress rotated files with gzip
|
||||
compress
|
||||
|
||||
# postpone compression to the next rotation
|
||||
delaycompress
|
||||
|
||||
# ignore missing files
|
||||
missingok
|
||||
|
||||
|
||||
@ -1,21 +1,45 @@
|
||||
#!/bin/sh
|
||||
# managed by puppet
|
||||
#
|
||||
# Due to bug in logrotate, it always returns 0. Use grep for detect errors;
|
||||
# exit code 1 is considered a success as no errors were found.
|
||||
#!/bin/bash
|
||||
lock() {
|
||||
exec 903>/var/lock/fuel-logrotate
|
||||
flock -n 903 && return 0 || return 1
|
||||
}
|
||||
|
||||
if ! pgrep -x logrotate >/dev/null 2>&1; then
|
||||
nice ionice -c3 /usr/sbin/logrotate /etc/logrotate.d/fuel.nodaily >& /tmp/logrotate
|
||||
unlock() {
|
||||
flock -u 903
|
||||
}
|
||||
|
||||
fail() {
|
||||
if [ -z "$1" ]
|
||||
then
|
||||
MESSAGE="WARNING logrotate failed, no reason provided"
|
||||
else
|
||||
MESSAGE=$1
|
||||
fi
|
||||
/usr/bin/logger -t logrotate "${MESSAGE}"
|
||||
unlock
|
||||
exit 1
|
||||
}
|
||||
|
||||
lock || fail "WARNING logrotate flock failed, exiting"
|
||||
|
||||
nice ionice -c3 /usr/sbin/logrotate /etc/logrotate.d/fuel.nodaily >& /tmp/logrotate
|
||||
EXITVALUE=$?
|
||||
|
||||
if [ -f /etc/redhat-release ] || [ -f /etc/centos-release ];
|
||||
then
|
||||
# Due to bug in logrotate on centos/rhel, it always returns 0. Use grep for
|
||||
# detect errors; exit code 1 is considered a success as no errors were
|
||||
# found.
|
||||
grep -q error /tmp/logrotate
|
||||
EXITVALUE=$?
|
||||
EXPECTEDVALUE=1
|
||||
else
|
||||
/usr/bin/logger -t logrotate "WARNING another logrotate instance is already running, exiting"
|
||||
exit 1
|
||||
EXPECTEDVALUE=0
|
||||
fi
|
||||
|
||||
if [ $EXITVALUE != 1 ]; then
|
||||
/usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE] (1 was expected)"
|
||||
exit 1
|
||||
if [ "${EXITVALUE}" != "${EXPECTEDVALUE}" ]; then
|
||||
fail "ALERT exited abnormally with [${EXITVALUE}] (${EXPECTEDVALUE} was expected)"
|
||||
fi
|
||||
|
||||
unlock
|
||||
exit 0
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
#!/bin/sh
|
||||
# managed by puppet
|
||||
# Clean non existent log file entries from status file
|
||||
cd /var/lib/logrotate
|
||||
test -e status || touch status
|
||||
head -1 status > status.clean
|
||||
sed 's/"//g' status | while read logfile date
|
||||
do
|
||||
[ -e "$logfile" ] && echo "\"$logfile\" $date"
|
||||
done >> status.clean
|
||||
mv status.clean status
|
||||
test -x /usr/sbin/logrotate || exit 0
|
||||
|
||||
if ! pgrep -x logrotate >/dev/null 2>&1; then
|
||||
nice ionice -c3 /usr/sbin/logrotate /etc/logrotate.d/fuel.nodaily
|
||||
EXITVALUE=$?
|
||||
else
|
||||
/usr/bin/logger -t logrotate "WARNING another logrotate instance is already running, exiting"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ $EXITVALUE != 0 ]; then
|
||||
/usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE] (0 was expected)"
|
||||
fi
|
||||
|
||||
exit $EXITVALUE
|
||||
|
||||
Loading…
Reference in New Issue
Block a user