upstart: try udevadm settle if osd journal isn't present

Wait briefly for the journal to appear if it isn't there yet, then give up.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/upstart/ceph-osd.conf b/src/upstart/ceph-osd.conf
index 7bf8d704e2658effeb4fcbcfb4c382bdb97fac66..e26bbc790b9ca281ff7bf651aaf579b21896fd46 100644 (file)
--- a/src/upstart/ceph-osd.conf
+++ b/src/upstart/ceph-osd.conf
@@ -38,9 +38,12 @@ pre-start script
 
     journal="/var/lib/ceph/osd/${cluster:-ceph}-$id/journal"
     if [ -L "$journal" -a ! -e "$journal" ]; then
-       echo "ceph-osd($UPSTART_INSTANCE): journal not present, not starting yet." 1>&2
-       stop
-       exit 0
+        udevadm settle --timeout=5 || :
+       if [ -L "$journal" -a ! -e "$journal" ]; then
+            echo "ceph-osd($UPSTART_INSTANCE): journal not present, not starting yet." 1>&2
+           stop
+           exit 0
+       fi
     fi
 end script