Merge pull request #19864 from owncloud/fix-objectstore-btrfs-host

skip btrfs hack for objectstore docker container on btrfs host
owncloud · Oct 19, 2015 · c530c9c · c530c9c
2 parents 9c5337c + 6d3a9bf
commit c530c9c
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/tests/objectstore/entrypoint.sh b/tests/objectstore/entrypoint.sh
@@ -136,15 +136,18 @@ ceph osd pool set rbd size 1
 if [ ! -e /var/lib/ceph/osd/${CLUSTER}-0/keyring ]; then
  # bootstrap OSD
  mkdir -p /var/lib/ceph/osd/${CLUSTER}-0
- # HACK create btrfs loopback device
- echo "creating osd storage image"
- dd if=/dev/zero of=/tmp/osddata bs=1M count=${OSD_SIZE}
- mkfs.btrfs /tmp/osddata
- echo "mounting via loopback"
- mount -o loop /tmp/osddata /var/lib/ceph/osd/${CLUSTER}-0
- echo "now mounted:"
- mount
- # end HACK
+ # skip btrfs HACK if btrfs is already in place
+ if [ "$(stat -f /var/lib/ceph/osd/${CLUSTER}-0 2>/dev/null | grep btrfs | wc -l)" == "0" ]; then
+ # HACK create btrfs loopback device
+ echo "creating osd storage image"
+ dd if=/dev/zero of=/tmp/osddata bs=1M count=${OSD_SIZE}
+ mkfs.btrfs /tmp/osddata
+ echo "mounting via loopback"
+ mount -o loop /tmp/osddata /var/lib/ceph/osd/${CLUSTER}-0
+ echo "now mounted:"
+ mount
+ # end HACK
+ fi
  echo "creating osd"
  ceph osd create
  echo "creating osd filesystem"
@@ -268,4 +271,4 @@ fi
 #########
 
 echo "watching ceph"
-exec ceph -w
+exec ceph -w