Avoid OSD bootstrap loop

Every time an osd_ceph_disk container is restarted the OSD_DEVICE is bootstrapped.
thereallukl · Jul 28, 2015 · f06a653 · f06a653
1 parent a057011
commit f06a653
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/daemon/entrypoint.sh b/daemon/entrypoint.sh
@@ -143,7 +143,13 @@ function start_osd {
          osd_directory
          ;;
       disk)
-         osd_disk
+         if [ -n "$(find /var/lib/ceph/osd -prune -empty)" ]; then
+           echo "No bootstrapped OSDs found; trying ceph-disk on ${OSD_DEVICE}"
+           osd_disk
+         else
+           echo "Bootstrapped OSD(s) found; ${OSD_DEVICE} won't be bootstrapped this time"
+           osd_activate
+         fi
          ;;
       activate)
          osd_activate