From: Loic Dachary <ldachary@redhat.com>
Date: Wed, 4 Mar 2015 14:43:15 +0000 (+0100)
Subject: tests: ceph-disk paritition creation and partition table in use
X-Git-Tag: v9.0.0~167^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=af890731da927047fe31aa23fbeae84b480da429;p=ceph.git

tests: ceph-disk paritition creation and partition table in use

The kernel partition table notification (via partprobe, partx, etc.) may
behave differently when a partition is in use. Add a test case that
checks a new journal partition shows as expected, even if another
journal partition is in use.

http://tracker.ceph.com/issues/10987 Refs: #10987

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

diff --git a/src/test/ceph-disk.sh b/src/test/ceph-disk.sh
index 8049aa0fc0a3..5981226ed957 100755
--- a/src/test/ceph-disk.sh
+++ b/src/test/ceph-disk.sh
@@ -357,9 +357,22 @@ function activate_dev_body() {
 
     setup
     run_mon
+    #
+    # Create an OSD and reuse an existing journal partition
+    #
     test_activate $newdisk ${newdisk}p1 ${journal}p1 || return 1
+    #
+    # Create an OSD and get a journal partition from a disk that
+    # already contains a journal partition which is in use. Updates of
+    # the kernel partition table may behave differently when a
+    # partition is in use. See http://tracker.ceph.com/issues/7334 for
+    # more information.
+    #
+    ceph-disk zap $disk || return 1
+    test_activate $disk ${disk}p1 $journal || return 1
     kill_daemons
     umount ${newdisk}p1 || return 1
+    umount ${disk}p1 || return 1
     teardown
 }