shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

Partial revert "tests: update to md dev name"

Browse Source 
This partially reverts commit c2ff8876f97a5840cd9d6fcda1bec55ef6220dc3.

Not all MD devices are stopped. Something is missing there...
This commit is contained in:
Marian Csontos 2019-11-25 09:23:02 +01:00
parent 1e669ab315
commit 4757ce4c2a
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/lib/aux.sh
View File

@ -421,15 +421,13 @@ teardown_devs() {
teardown_udev_cookies
test ! -f MD_DEV || cleanup_md_dev
test ! -f WAIT_MD_DEV || mddev=$(< WAIT_MD_DEV)
udev_wait
test ! -f WAIT_MD_DEV || mdadm --stop $mddev || true
mdadm --stop --scan || true
udev_wait
test ! -f DEVICES || teardown_devs_prefixed "$PREFIX"
test ! -f RAMDISK || { modprobe -r brd || true ; }
test ! -f WAIT_MD_DEV || mdadm --stop $mddev || true
mdadm --stop --scan || true
# NOTE: SCSI_DEBUG_DEV test must come before the LOOP test because
# prepare_scsi_debug_dev() also sets LOOP to short-circuit prepare_loop()
@ -794,7 +792,6 @@ wait_md_create() {
break
fi
done
echo "$md" > WAIT_MD_DEV
}
wipefs_a() {

2
test/shell/duplicate-pvs-md0.sh
View File

@ -369,6 +369,7 @@ aux aux udev_wait
cat /proc/mdstat
# for some reason enabling dev2 starts an odd md dev
mdadm --stop "$mddev" || true
mdadm --stop --scan
cat /proc/mdstat
aux wipefs_a "$dev1" || true
aux wipefs_a "$dev2" || true
@ -434,6 +435,7 @@ aux aux udev_wait
cat /proc/mdstat
# for some reason enabling dev2 starts an odd md dev
mdadm --stop "$mddev" || true
mdadm --stop --scan
cat /proc/mdstat
aux wipefs_a "$dev1" || true
aux wipefs_a "$dev2" || true

3
test/shell/duplicate-pvs-md1.sh
View File

@ -416,6 +416,7 @@ aux udev_wait
cat /proc/mdstat
# for some reason enabling dev2 starts an odd md dev
mdadm --stop "$mddev" || true
mdadm --stop --scan
cat /proc/mdstat
aux wipefs_a "$dev1" || true
aux wipefs_a "$dev2" || true
@ -480,6 +481,7 @@ aux udev_wait
cat /proc/mdstat
# for some reason enabling dev2 starts an odd md dev
mdadm --stop "$mddev" || true
mdadm --stop --scan
cat /proc/mdstat
aux wipefs_a "$dev1" || true
aux wipefs_a "$dev2" || true
@ -618,6 +620,7 @@ aux udev_wait
cat /proc/mdstat
# for some reason enabling dev2 starts an odd md dev
mdadm --stop "$mddev" || true
mdadm --stop --scan
cat /proc/mdstat
aux wipefs_a "$dev1" || true
aux wipefs_a "$dev2" || true