ceph.logrotate.patch

   1 --- ceph-0.84/src/logrotate.conf.orig   2014-08-22 19:12:40.945575009 +0200
   2 +++ ceph-0.84/src/logrotate.conf        2014-08-22 19:14:59.222235873 +0200
   3 @@ -4,25 +4,7 @@
   4      compress
   5      sharedscripts
   6      postrotate
   7 -        if which invoke-rc.d > /dev/null 2>&1 && [ -x `which invoke-rc.d` ]; then
   8 -            invoke-rc.d ceph reload >/dev/null
   9 -        elif which service > /dev/null 2>&1 && [ -x `which service` ]; then
  10 -            service ceph reload >/dev/null
  11 -        fi
  12 -        # Possibly reload twice, but depending on ceph.conf the reload above may be a no-op
  13 -        if which initctl > /dev/null 2>&1 && [ -x `which initctl` ]; then
  14 -            for daemon in osd mon mds ; do
  15 -              find -L /var/lib/ceph/$daemon/ -mindepth 1 -maxdepth 1 -regextype posix-egrep -regex '.*/[A-Za-z0-9]+-[A-Za-z0-9._-]+' -printf '%P\n' \
  16 -                | while read f; do
  17 -                    if [ -e "/var/lib/ceph/$daemon/$f/done" -o -e "/var/lib/ceph/$daemon/$f/ready" ] && [ -e "/var/lib/ceph/$daemon/$f/upstart" ] && [ ! -e "/var/lib/ceph/$daemon/$f/sysvinit" ]; then
  18 -                      cluster="${f%%-*}"
  19 -                      id="${f#*-}"
  20 -
  21 -                      initctl reload ceph-$daemon cluster="$cluster" id="$id" 2>/dev/null || :
  22 -                    fi
  23 -                  done
  24 -            done
  25 -        fi
  26 +        cephctl reload >/dev/null 2>/dev/null
  27      endscript
  28      missingok
  29      notifempty