From: Karel Zak <kzak@redhat.com>
Date: Thu, 7 Dec 2017 11:31:41 +0000 (+0100)
Subject: tests: add mdadm locks
X-Git-Tag: v2.32-rc1~142
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f1254fae6da55d172c9f1e902db92231e51b48d5;p=thirdparty%2Futil-linux.git

tests: add mdadm locks

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/tests/ts/blkid/md-raid0-whole b/tests/ts/blkid/md-raid0-whole
index cbfb1eb7cc..45c6ee55b0 100755
--- a/tests/ts/blkid/md-raid0-whole
+++ b/tests/ts/blkid/md-raid0-whole
@@ -41,6 +41,7 @@ DEVICE2=$TS_LODEV
 MD_DEVNAME=md8
 MD_DEVICE=/dev/${MD_DEVNAME}
 
+ts_lock "md"
 mdadm -q -S ${MD_DEVICE} &> /dev/null
 
 ts_log "Create RAID device"
@@ -76,6 +77,7 @@ ts_log "Stop RAID device"
 mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1
 
 udevadm settle
+ts_unlock "md"
 
 ts_log "Deinitialize devices"
 
diff --git a/tests/ts/blkid/md-raid1-part b/tests/ts/blkid/md-raid1-part
index 9f1276186c..3fa6395b04 100755
--- a/tests/ts/blkid/md-raid1-part
+++ b/tests/ts/blkid/md-raid1-part
@@ -62,6 +62,8 @@ udevadm settle
 MD_DEVNAME=md8
 MD_DEVICE=/dev/${MD_DEVNAME}
 
+ts_lock "md"
+
 ts_log "Create RAID1 device"
 mdadm -q -S ${MD_DEVICE} &> /dev/null
 mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 --level=1 \
@@ -79,6 +81,8 @@ $TS_CMD_BLKID -p -o udev ${TS_DEVICE}2 2>&1 | sort >> $TS_OUTPUT
 
 mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1
 
+udevadm settle
+ts_unlock "md"
 
 ts_fdisk_clean $TS_DEVICE
 # substitue UUIDs and major/minor number before comparison
diff --git a/tests/ts/blkid/md-raid1-whole b/tests/ts/blkid/md-raid1-whole
index 050adecd7a..ddf4a6934d 100755
--- a/tests/ts/blkid/md-raid1-whole
+++ b/tests/ts/blkid/md-raid1-whole
@@ -41,11 +41,15 @@ DEVICE2=$TS_LODEV
 MD_DEVNAME=md8
 MD_DEVICE=/dev/${MD_DEVNAME}
 
+ts_lock "md"
+
 mdadm -q -S ${MD_DEVICE} &> /dev/null
+udevadm settle
 
 ts_log "Create RAID device"
 mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 --level=1 \
 	    --raid-devices=2 ${DEVICE1} ${DEVICE2} >> $TS_OUTPUT 2>&1
+udevadm settle
 
 ts_log "Create partitions on RAID device"
 $TS_CMD_FDISK ${MD_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
@@ -76,6 +80,7 @@ ts_log "Stop RAID device"
 mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1
 
 udevadm settle
+ts_unlock "md"
 
 ts_log "Deinitialize devices"
 
diff --git a/tests/ts/fdisk/align-512-4K-md b/tests/ts/fdisk/align-512-4K-md
index 04c3df68ec..7f60a654f2 100755
--- a/tests/ts/fdisk/align-512-4K-md
+++ b/tests/ts/fdisk/align-512-4K-md
@@ -56,14 +56,18 @@ udevadm settle
 ts_log "Alignment offsets:"
 cat /sys/block/${DEVNAME}/${DEVNAME}{1,2}/alignment_offset >> $TS_OUTPUT 2>&1
 
+ts_lock "md"
+
 MD_DEVNAME=md8
 MD_DEVICE=/dev/${MD_DEVNAME}
 
 mdadm -q -S ${MD_DEVICE} &> /dev/null
+udevadm settle
+
 mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 \
 	    --level=0 --raid-devices=2 ${TS_DEVICE}1 ${TS_DEVICE}2 >> $TS_OUTPUT 2>&1
-
 udevadm settle
+
 ts_log "Create partitions (MD)"
 $TS_CMD_FDISK ${MD_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
 n
@@ -87,6 +91,9 @@ cat /sys/block/${MD_DEVNAME}/${MD_DEVNAME}p{1,2}/alignment_offset >> $TS_OUTPUT
 
 mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1
 
+udevadm settle
+ts_unlock "md"
+
 ts_fdisk_clean $TS_DEVICE
 ts_fdisk_clean $MD_DEVICE