From 6d3a9bf03ac538f282a4951e0409a293aa3b45a1 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Mon, 19 Oct 2015 10:32:51 +0200
Subject: [PATCH] skip btrfs hack for objectstore docker container on btrfs
 host

---
 tests/objectstore/entrypoint.sh | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/tests/objectstore/entrypoint.sh b/tests/objectstore/entrypoint.sh
index b490d760a2fd..6dd6ef23fb6f 100755
--- 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
\ No newline at end of file
+exec ceph -w