mirror of
git://sourceware.org/git/lvm2.git
synced 2025-01-04 09:18:36 +03:00
tests: remove unused wait_md_create
This commit is contained in:
parent
7166bbd9c2
commit
077040199d
@ -421,16 +421,9 @@ teardown_devs() {
|
|||||||
teardown_udev_cookies
|
teardown_udev_cookies
|
||||||
|
|
||||||
test ! -f MD_DEV || cleanup_md_dev
|
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
|
|
||||||
udev_wait
|
|
||||||
test ! -f DEVICES || teardown_devs_prefixed "$PREFIX"
|
test ! -f DEVICES || teardown_devs_prefixed "$PREFIX"
|
||||||
test ! -f RAMDISK || { modprobe -r brd || true ; }
|
test ! -f RAMDISK || { modprobe -r brd || true ; }
|
||||||
|
|
||||||
test ! -f WAIT_MD_DEV || mdadm --stop $mddev || true
|
|
||||||
|
|
||||||
# NOTE: SCSI_DEBUG_DEV test must come before the LOOP test because
|
# NOTE: SCSI_DEBUG_DEV test must come before the LOOP test because
|
||||||
# prepare_scsi_debug_dev() also sets LOOP to short-circuit prepare_loop()
|
# prepare_scsi_debug_dev() also sets LOOP to short-circuit prepare_loop()
|
||||||
if test -f SCSI_DEBUG_DEV; then
|
if test -f SCSI_DEBUG_DEV; then
|
||||||
@ -716,64 +709,6 @@ cleanup_scsi_debug_dev() {
|
|||||||
rm -f SCSI_DEBUG_DEV LOOP
|
rm -f SCSI_DEBUG_DEV LOOP
|
||||||
}
|
}
|
||||||
|
|
||||||
prepare_md_dev() {
|
|
||||||
local level=$1
|
|
||||||
local rchunk=$2
|
|
||||||
local rdevs=$3
|
|
||||||
local with_bitmap="--bitmap=internal"
|
|
||||||
local coption="--chunk"
|
|
||||||
local maj
|
|
||||||
local mddev
|
|
||||||
local mddir="md/"
|
|
||||||
local mdname
|
|
||||||
local mddevdir
|
|
||||||
maj=$(mdadm --version 2>&1) || skip "mdadm tool is missing!"
|
|
||||||
|
|
||||||
cleanup_md_dev
|
|
||||||
|
|
||||||
rm -f debug.log strace.log
|
|
||||||
|
|
||||||
case "$level" in
|
|
||||||
"1") coption="--bitmap-chunk" ;;
|
|
||||||
"0") with_bitmap="" ;;
|
|
||||||
esac
|
|
||||||
# Have MD use a non-standard name to avoid colliding with an existing MD device
|
|
||||||
# - mdadm >= 3.0 requires that non-standard device names be in /dev/md/
|
|
||||||
# - newer mdadm _completely_ defers to udev to create the associated device node
|
|
||||||
maj=${maj##*- v}
|
|
||||||
maj=${maj%%.*}
|
|
||||||
[ "$maj" -ge 3 ] || mddir=""
|
|
||||||
|
|
||||||
mdname="md_lvm_test0"
|
|
||||||
mddev="/dev/${mddir}$mdname"
|
|
||||||
mddevdir="$DM_DEV_DIR/$mddir"
|
|
||||||
|
|
||||||
mdadm --create --metadata=1.0 "$mddev" --auto=md --level "$level" $with_bitmap "$coption"="$rchunk" --raid-devices="$rdevs" "${@:4}" || {
|
|
||||||
# Some older 'mdadm' version managed to open and close devices internaly
|
|
||||||
# and reporting non-exclusive access on such device
|
|
||||||
# let's just skip the test if this happens.
|
|
||||||
# Note: It's pretty complex to get rid of consequences
|
|
||||||
# the following sequence avoid leaks on f19
|
|
||||||
# TODO: maybe try here to recreate few times....
|
|
||||||
mdadm --stop "$mddev" || true
|
|
||||||
udev_wait
|
|
||||||
mdadm --zero-superblock "${@:4}" || true
|
|
||||||
udev_wait
|
|
||||||
skip "Test skipped, unreliable mdadm detected!"
|
|
||||||
}
|
|
||||||
test -b "$mddev" || skip "mdadm has not created device!"
|
|
||||||
|
|
||||||
# LVM/DM will see this device
|
|
||||||
case "$DM_DEV_DIR" in
|
|
||||||
"/dev") readlink -f "$mddev" > MD_DEV_PV ;;
|
|
||||||
*) mkdir -p "$mddevdir"
|
|
||||||
cp -LR "$mddev" "$mddevdir"
|
|
||||||
echo "${mddevdir}${mdname}" > MD_DEV_PV ;;
|
|
||||||
esac
|
|
||||||
echo "$mddev" > MD_DEV
|
|
||||||
printf "%s\n" "${@:4}" > MD_DEVICES
|
|
||||||
}
|
|
||||||
|
|
||||||
mdadm_create() {
|
mdadm_create() {
|
||||||
local mddev
|
local mddev
|
||||||
local maj=
|
local maj=
|
||||||
@ -872,21 +807,6 @@ cleanup_md_dev() {
|
|||||||
rm -f MD_DEV MD_DEVICES MD_DEV_PV
|
rm -f MD_DEV MD_DEVICES MD_DEV_PV
|
||||||
}
|
}
|
||||||
|
|
||||||
wait_md_create() {
|
|
||||||
local md=$1
|
|
||||||
|
|
||||||
while :; do
|
|
||||||
if ! grep "$(basename $md)" /proc/mdstat; then
|
|
||||||
echo "$md not ready"
|
|
||||||
cat /proc/mdstat
|
|
||||||
sleep 2
|
|
||||||
else
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
echo "$md" > WAIT_MD_DEV
|
|
||||||
}
|
|
||||||
|
|
||||||
wipefs_a() {
|
wipefs_a() {
|
||||||
local dev=$1
|
local dev=$1
|
||||||
shift
|
shift
|
||||||
|
Loading…
Reference in New Issue
Block a user