]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/workunits/cephadm: create lvs before calling cephadm
authorJan Fajerski <jfajerski@suse.com>
Tue, 24 Mar 2020 13:53:26 +0000 (14:53 +0100)
committerSage Weil <sage@redhat.com>
Tue, 24 Mar 2020 21:39:17 +0000 (16:39 -0500)
Fixes: https://tracker.ceph.com/issues/44682
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit ed0db2445f0de91b2ce53fd133cc8381cb234d1e)

qa/workunits/cephadm/test_cephadm.sh

index af09b2505568a6f175f05b060167b7eb32dc3e49..1be330d80e6b485c23c168d4649927517466161e 100755 (executable)
@@ -281,8 +281,12 @@ $SUDO pvcreate $loop_dev && $SUDO vgcreate $OSD_VG_NAME $loop_dev
 $CEPHADM shell --fsid $FSID --config $CONFIG --keyring $KEYRING -- \
       ceph auth get client.bootstrap-osd > $TMPDIR/keyring.bootstrap.osd
 
+# create lvs first so ceph-volume doesn't overlap with lv creation
 for id in `seq 0 $((--OSD_TO_CREATE))`; do
     $SUDO lvcreate -l $((100/$OSD_TO_CREATE))%VG -n $OSD_LV_NAME.$id $OSD_VG_NAME
+done
+
+for id in `seq 0 $((--OSD_TO_CREATE))`; do
     device_name=/dev/$OSD_VG_NAME/$OSD_LV_NAME.$id
 
     # prepare the osd