From: Loic Dachary <ldachary@redhat.com>
Date: Wed, 1 Apr 2015 14:36:09 +0000 (+0200)
Subject: tests: add ceph-disk.sh activate for memstore
X-Git-Tag: v9.0.0~44^2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=106d0067877b4d23fae9bcfe00dceaad488ac364;p=ceph.git

tests: add ceph-disk.sh activate for memstore

Add a test for the activation of the memstore objectstore and verify
that it works without specifying a journal.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---

diff --git a/src/test/ceph-disk.sh b/src/test/ceph-disk.sh
index 25c00e3e468f..6ec1ae9747ca 100755
--- a/src/test/ceph-disk.sh
+++ b/src/test/ceph-disk.sh
@@ -407,11 +407,25 @@ function activate_dev_body() {
     local journal=$2
     local newdisk=$3
 
+    setup
+    run_mon
+    #
+    # Create an OSD without a journal and an objectstore
+    # that does not use a journal.
+    #
+    ceph-disk zap $disk || return 1
+    CEPH_ARGS="$CEPH_ARGS --osd-objectstore=memstore" \
+        test_activate $disk ${disk}p1 || return 1
+    kill_daemons
+    umount ${disk}p1 || return 1
+    teardown
+
     setup
     run_mon
     #
     # Create an OSD with data on a disk, journal on another
     #
+    ceph-disk zap $disk || return 1
     test_activate $disk ${disk}p1 $journal || return 1
     kill_daemons
     umount ${disk}p1 || return 1