From: Sage Weil <sage@redhat.com>
Date: Thu, 17 Jul 2014 23:40:06 +0000 (-0700)
Subject: logrotate.conf: fix osd log rotation under upstart
X-Git-Tag: v0.83~13^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=14a9ca602fa9573b0b6b94709b384bca02d12fac;p=ceph.git

logrotate.conf: fix osd log rotation under upstart

In commit 7411c3c6a42bef5987bdd76b1812b01686303502 we generalized this
enumeration code by copying what was in the upstart scripts.  However,
while the mon and mds directories get a 'done' file, the OSDs get a 'ready'
file.  Bah!  Trigger off of either one.

Backport: firefly
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/logrotate.conf b/src/logrotate.conf
index 9f69646f7695..1833d55cfd73 100644
--- a/src/logrotate.conf
+++ b/src/logrotate.conf
@@ -14,7 +14,7 @@
             for daemon in osd mon mds ; do
               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' \
                 | while read f; do
-                    if [ -e "/var/lib/ceph/$daemon/$f/done" ] && [ -e "/var/lib/ceph/$daemon/$f/upstart" ] && [ ! -e "/var/lib/ceph/$daemon/$f/sysvinit" ]; then
+                    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
                       cluster="${f%%-*}"
                       id="${f#*-}"