apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

common: Add _dmsetup_create and _dmsetup_remove helpers

Browse Source 
Make sure both "$UDEV_SETTLE_PROG" and "mknodes" can always
be run after a dm create or remove operation.

Suggested-by: Dave Chinner <david@fromorbit.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Xiao Yang
2018-06-28 09:45:34 +08:00
committed by Eryu Guan
parent 6b6ff4a005
commit f86ce7cc4b
8 changed files with 42 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/dmdelay
+2 -7
View File
@@ -18,9 +18,8 @@ _init_delay()
DELAY_DEV=/dev/mapper/delay-test DELAY_DEV=/dev/mapper/delay-test
DELAY_TABLE="0 $BLK_DEV_SIZE delay $SCRATCH_DEV 0 0" DELAY_TABLE="0 $BLK_DEV_SIZE delay $SCRATCH_DEV 0 0"
DELAY_TABLE_RDELAY="0 $BLK_DEV_SIZE delay $SCRATCH_DEV 0 10000 $SCRATCH_DEV 0 0" DELAY_TABLE_RDELAY="0 $BLK_DEV_SIZE delay $SCRATCH_DEV 0 10000 $SCRATCH_DEV 0 0"
$DMSETUP_PROG create delay-test --table "$DELAY_TABLE" || \ _dmsetup_create delay-test --table "$DELAY_TABLE" || \
_fatal "failed to create delay device" _fatal "failed to create delay device"
$DMSETUP_PROG mknodes > /dev/null 2>&1
} }
_mount_delay() _mount_delay()
@@ -41,11 +40,7 @@ _cleanup_delay()
# otherwise the umount will hang # otherwise the umount will hang
$DMSETUP_PROG resume delay-test > /dev/null 2>&1 $DMSETUP_PROG resume delay-test > /dev/null 2>&1
$UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1 $UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
# wait for device to be fully settled so that 'dmsetup remove' doesn't _dmsetup_remove delay-test
# fail due to EBUSY
$UDEV_SETTLE_PROG >/dev/null 2>&1
$DMSETUP_PROG remove delay-test > /dev/null 2>&1
$DMSETUP_PROG mknodes > /dev/null 2>&1
} }
# _load_delay_table <table> [lockfs] # _load_delay_table <table> [lockfs]
common/dmerror
+3 -6
View File
@@ -25,8 +25,8 @@ _dmerror_setup()
_dmerror_init() _dmerror_init()
{ {
_dmerror_setup _dmerror_setup
$DMSETUP_PROG remove error-test > /dev/null 2>&1 _dmsetup_remove error-test
$DMSETUP_PROG create error-test --table "$DMLINEAR_TABLE" || \ _dmsetup_create error-test --table "$DMLINEAR_TABLE" || \
_fatal "failed to create dm linear device" _fatal "failed to create dm linear device"
} }
@@ -45,10 +45,7 @@ _dmerror_unmount()
_dmerror_cleanup() _dmerror_cleanup()
{ {
$UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1 $UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
# wait for device to be fully settled so that 'dmsetup remove' doesn't _dmsetup_remove error-test
# fail due to EBUSY
$UDEV_SETTLE_PROG >/dev/null 2>&1
$DMSETUP_PROG remove error-test > /dev/null 2>&1
} }
_dmerror_load_error_table() _dmerror_load_error_table()
common/dmflakey
+3 -11
View File
@@ -20,9 +20,8 @@ _init_flakey()
FLAKEY_TABLE="0 $BLK_DEV_SIZE flakey $SCRATCH_DEV 0 180 0" FLAKEY_TABLE="0 $BLK_DEV_SIZE flakey $SCRATCH_DEV 0 180 0"
FLAKEY_TABLE_DROP="0 $BLK_DEV_SIZE flakey $SCRATCH_DEV 0 0 180 1 drop_writes" FLAKEY_TABLE_DROP="0 $BLK_DEV_SIZE flakey $SCRATCH_DEV 0 0 180 1 drop_writes"
FLAKEY_TABLE_ERROR="0 $BLK_DEV_SIZE flakey $SCRATCH_DEV 0 0 180 1 error_writes" FLAKEY_TABLE_ERROR="0 $BLK_DEV_SIZE flakey $SCRATCH_DEV 0 0 180 1 error_writes"
$DMSETUP_PROG create flakey-test --table "$FLAKEY_TABLE" || \ _dmsetup_create flakey-test --table "$FLAKEY_TABLE" || \
_fatal "failed to create flakey device" _fatal "failed to create flakey device"
$DMSETUP_PROG mknodes > /dev/null 2>&1
} }
_mount_flakey() _mount_flakey()
@@ -42,11 +41,7 @@ _cleanup_flakey()
# otherwise the umount will hang # otherwise the umount will hang
$DMSETUP_PROG resume flakey-test > /dev/null 2>&1 $DMSETUP_PROG resume flakey-test > /dev/null 2>&1
$UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1 $UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
# wait for device to be fully settled so that 'dmsetup remove' doesn't _dmsetup_remove flakey-test
# fail due to EBUSY
$UDEV_SETTLE_PROG >/dev/null 2>&1
$DMSETUP_PROG remove flakey-test > /dev/null 2>&1
$DMSETUP_PROG mknodes > /dev/null 2>&1
} }
# _load_flakey_table <table> [lockfs] # _load_flakey_table <table> [lockfs]
@@ -101,11 +96,8 @@ _require_flakey_with_error_writes()
SIZE=`blockdev --getsz $SCRATCH_DEV` SIZE=`blockdev --getsz $SCRATCH_DEV`
TABLE="0 $SIZE flakey $SCRATCH_DEV 0 0 180 1 error_writes" TABLE="0 $SIZE flakey $SCRATCH_DEV 0 0 180 1 error_writes"
$DMSETUP_PROG create $NAME --table "$TABLE" >/dev/null 2>&1 _dmsetup_create $NAME --table "$TABLE" || \
if [ $? -ne 0 ]; then
_notrun "This test requires error_writes feature in dm-flakey" _notrun "This test requires error_writes feature in dm-flakey"
fi
$DMSETUP_PROG mknodes >/dev/null 2>&1
_cleanup_flakey _cleanup_flakey
} }
common/dmhugedisk
+6 -9
View File
@@ -20,8 +20,8 @@ _dmhugedisk_init()
chunk_size=512 chunk_size=512
fi fi
$DMSETUP_PROG remove huge-test > /dev/null 2>&1 _dmsetup_remove huge-test
$DMSETUP_PROG remove huge-test-zero > /dev/null 2>&1 _dmsetup_remove huge-test-zero
local blk_dev_size=$1 local blk_dev_size=$1
@@ -31,18 +31,15 @@ _dmhugedisk_init()
DMHUGEDISK_ZERO_TABLE="0 $blk_dev_size zero" DMHUGEDISK_ZERO_TABLE="0 $blk_dev_size zero"
DMHUGEDISK_DEV_TABLE="0 $blk_dev_size snapshot $DMHUGEDISK_ZERO $SCRATCH_DEV N $chunk_size" DMHUGEDISK_DEV_TABLE="0 $blk_dev_size snapshot $DMHUGEDISK_ZERO $SCRATCH_DEV N $chunk_size"
$DMSETUP_PROG create huge-test-zero --table "$DMHUGEDISK_ZERO_TABLE" || \ _dmsetup_create huge-test-zero --table "$DMHUGEDISK_ZERO_TABLE" || \
_fatal "failed to create dm huge zero device" _fatal "failed to create dm huge zero device"
$DMSETUP_PROG create huge-test --table "$DMHUGEDISK_DEV_TABLE" || \ _dmsetup_create huge-test --table "$DMHUGEDISK_DEV_TABLE" || \
_fatal "failed to create dm huge device" _fatal "failed to create dm huge device"
} }
_dmhugedisk_cleanup() _dmhugedisk_cleanup()
{ {
$UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1 $UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
# wait for device to be fully settled so that 'dmsetup remove' doesn't _dmsetup_remove huge-test
# fail due to EBUSY _dmsetup_remove huge-test-zero
$UDEV_SETTLE_PROG >/dev/null 2>&1
$DMSETUP_PROG remove huge-test > /dev/null 2>&1
$DMSETUP_PROG remove huge-test-zero > /dev/null 2>&1
} }
common/dmlogwrites
+2 -7
View File
@@ -51,9 +51,8 @@ _log_writes_init()
LOGWRITES_NAME=logwrites-test LOGWRITES_NAME=logwrites-test
LOGWRITES_DMDEV=/dev/mapper/$LOGWRITES_NAME LOGWRITES_DMDEV=/dev/mapper/$LOGWRITES_NAME
LOGWRITES_TABLE="0 $BLK_DEV_SIZE log-writes $SCRATCH_DEV $LOGWRITES_DEV" LOGWRITES_TABLE="0 $BLK_DEV_SIZE log-writes $SCRATCH_DEV $LOGWRITES_DEV"
$DMSETUP_PROG create $LOGWRITES_NAME --table "$LOGWRITES_TABLE" || \ _dmsetup_create $LOGWRITES_NAME --table "$LOGWRITES_TABLE" || \
_fail "failed to create log-writes device" _fail "failed to create log-writes device"
$DMSETUP_PROG mknodes > /dev/null 2>&1
} }
_log_writes_mark() _log_writes_mark()
@@ -100,16 +99,12 @@ _log_writes_replay_log()
_log_writes_remove() _log_writes_remove()
{ {
$DMSETUP_PROG remove $LOGWRITES_NAME > /dev/null 2>&1 _dmsetup_remove $LOGWRITES_NAME
$DMSETUP_PROG mknodes > /dev/null 2>&1
} }
_log_writes_cleanup() _log_writes_cleanup()
{ {
$UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1 $UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
# wait for device to be fully settled so that 'dmsetup remove' doesn't
# fail due to EBUSY
$UDEV_SETTLE_PROG >/dev/null 2>&1
_log_writes_remove _log_writes_remove
} }
common/dmthin
+8 -11
View File
@@ -29,13 +29,10 @@ fi
_dmthin_cleanup() _dmthin_cleanup()
{ {
$UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1 $UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
# wait for device to be fully settled so that 'dmsetup remove' doesn't _dmsetup_remove $DMTHIN_VOL_NAME
# fail due to EBUSY _dmsetup_remove $DMTHIN_POOL_NAME
$UDEV_SETTLE_PROG >/dev/null 2>&1 _dmsetup_remove $DMTHIN_META_NAME
$DMSETUP_PROG remove $DMTHIN_VOL_NAME> /dev/null 2>&1 _dmsetup_remove $DMTHIN_DATA_NAME
$DMSETUP_PROG remove $DMTHIN_POOL_NAME> /dev/null 2>&1
$DMSETUP_PROG remove $DMTHIN_META_NAME> /dev/null 2>&1
$DMSETUP_PROG remove $DMTHIN_DATA_NAME> /dev/null 2>&1
} }
_dmthin_check_fs() _dmthin_check_fs()
@@ -112,13 +109,13 @@ _dmthin_init()
# Metadata device # Metadata device
DMTHIN_META_TABLE="0 $meta_dev_size linear $dm_backing_dev $meta_dev_offset" DMTHIN_META_TABLE="0 $meta_dev_size linear $dm_backing_dev $meta_dev_offset"
$DMSETUP_PROG create $DMTHIN_META_NAME --table "$DMTHIN_META_TABLE" || \ _dmsetup_create $DMTHIN_META_NAME --table "$DMTHIN_META_TABLE" || \
_fatal "failed to create dm thin meta device" _fatal "failed to create dm thin meta device"
# Data device # Data device
local data_dev_offset=$((meta_dev_offset + $meta_dev_size)) local data_dev_offset=$((meta_dev_offset + $meta_dev_size))
DMTHIN_DATA_TABLE="0 $data_dev_size linear $dm_backing_dev $data_dev_offset" DMTHIN_DATA_TABLE="0 $data_dev_size linear $dm_backing_dev $data_dev_offset"
$DMSETUP_PROG create $DMTHIN_DATA_NAME --table "$DMTHIN_DATA_TABLE" || \ _dmsetup_create $DMTHIN_DATA_NAME --table "$DMTHIN_DATA_TABLE" || \
_fatal "failed to create dm thin data device" _fatal "failed to create dm thin data device"
# Zap the pool metadata dev # Zap the pool metadata dev
@@ -127,7 +124,7 @@ _dmthin_init()
# Thin pool # Thin pool
# "start length thin-pool metadata_dev data_dev data_block_size low_water_mark" # "start length thin-pool metadata_dev data_dev data_block_size low_water_mark"
DMTHIN_POOL_TABLE="0 $data_dev_size thin-pool $DMTHIN_META_DEV $DMTHIN_DATA_DEV $cluster_size $low_water" DMTHIN_POOL_TABLE="0 $data_dev_size thin-pool $DMTHIN_META_DEV $DMTHIN_DATA_DEV $cluster_size $low_water"
$DMSETUP_PROG create $DMTHIN_POOL_NAME --table "$DMTHIN_POOL_TABLE" || \ _dmsetup_create $DMTHIN_POOL_NAME --table "$DMTHIN_POOL_TABLE" || \
_fatal "failed to create dm thin pool device" _fatal "failed to create dm thin pool device"
# Thin volume # Thin volume
@@ -136,7 +133,7 @@ _dmthin_init()
# start length thin pool_dev dev_id [external_origin_dev] # start length thin pool_dev dev_id [external_origin_dev]
DMTHIN_VOL_TABLE="0 $virtual_size thin $DMTHIN_POOL_DEV $pool_id" DMTHIN_VOL_TABLE="0 $virtual_size thin $DMTHIN_POOL_DEV $pool_id"
$DMSETUP_PROG create $DMTHIN_VOL_NAME --table "$DMTHIN_VOL_TABLE" || \ _dmsetup_create $DMTHIN_VOL_NAME --table "$DMTHIN_VOL_TABLE" || \
_fatal "failed to create dm thin volume device" _fatal "failed to create dm thin volume device"
} }
common/rc
+14
View File
@@ -3794,6 +3794,20 @@ _require_label_get_max()
dummy=$(_label_get_max) dummy=$(_label_get_max)
} }
_dmsetup_remove()
{
$UDEV_SETTLE_PROG >/dev/null 2>&1
$DMSETUP_PROG remove "$@" >>$seqres.full 2>&1
$DMSETUP_PROG mknodes >/dev/null 2>&1
}
_dmsetup_create()
{
$DMSETUP_PROG create "$@" >>$seqres.full 2>&1 || return 1
$DMSETUP_PROG mknodes >/dev/null 2>&1
$UDEV_SETTLE_PROG >/dev/null 2>&1
}
init_rc init_rc
################################################################################ ################################################################################
tests/generic/085
+4 -7
View File
@@ -31,9 +31,7 @@ cleanup_dmdev()
# in case it's still suspended and/or mounted # in case it's still suspended and/or mounted
$DMSETUP_PROG resume $lvdev >/dev/null 2>&1 $DMSETUP_PROG resume $lvdev >/dev/null 2>&1
$UMOUNT_PROG $lvdev >/dev/null 2>&1 $UMOUNT_PROG $lvdev >/dev/null 2>&1
_dmsetup_remove $node
$DMSETUP_PROG remove $node >>$seqres.full 2>&1
$DMSETUP_PROG mknodes >/dev/null 2>&1
} }
# get standard environment, filters and checks # get standard environment, filters and checks
@@ -51,9 +49,8 @@ _require_freeze
setup_dmdev() setup_dmdev()
{ {
table="0 $size_in_sector linear $SCRATCH_DEV 0" table="0 $size_in_sector linear $SCRATCH_DEV 0"
$DMSETUP_PROG create $node --table "$table" >>$seqres.full 2>&1 && \ _dmsetup_create $node --table "$table" || \
$DMSETUP_PROG mknodes >/dev/null 2>&1 _fail "setup dm device failed"
return $?
} }
rm -f $seqres.full rm -f $seqres.full
@@ -65,7 +62,7 @@ _scratch_mkfs_sized $size >>$seqres.full 2>&1
node=$seq-test node=$seq-test
lvdev=/dev/mapper/$node lvdev=/dev/mapper/$node
setup_dmdev || _fail "setup dm device failed" setup_dmdev
# take use of dmsetup suspend to freeze the fs. # take use of dmsetup suspend to freeze the fs.
# xfs_freeze/fsfreeze cannot be used in this test, because it can possibly # xfs_freeze/fsfreeze cannot be used in this test, because it can possibly