ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/iscsi_tgt: optimization for ext4 test.

Browse Source 
This patch make sure the mkfs command only run for 1 time for all
the devices.

Change-Id: Ic2fce52580d0ff871c77f56fce60ec5ca79e513c
Signed-off-by: cunyinch <cunyin.chang@intel.com>
Reviewed-on: https://review.gerrithub.io/361907
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: GangCao <gang.cao@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
cunyinch 2017-05-22 15:34:02 +08:00 committed by Ben Walker
parent 2ef5722f3c
commit 7fb3b2484c
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
test/iscsi_tgt/ext4test/ext4test.sh
View File

@ -42,10 +42,7 @@ $rpc_py construct_error_bdev 'Malloc0'
# "1:2" ==> map PortalGroup1 to InitiatorGroup2 # "1:2" ==> map PortalGroup1 to InitiatorGroup2
# "64" ==> iSCSI queue depth 64 # "64" ==> iSCSI queue depth 64
# "1 0 0 0" ==> disable CHAP authentication # "1 0 0 0" ==> disable CHAP authentication
if [ -z "$NO_NVME" ]; then $rpc_py construct_target_node Target0 Target0_alias EE_Malloc0:0 1:2 64 1 0 0 0
$rpc_py construct_target_node Target0 Target0_alias Nvme0n1:0 1:2 64 1 0 0 0
fi
$rpc_py construct_target_node Target1 Target1_alias EE_Malloc0:0 1:2 64 1 0 0 0
sleep 1 sleep 1
iscsiadm -m discovery -t sendtargets -p $TARGET_IP:$PORT iscsiadm -m discovery -t sendtargets -p $TARGET_IP:$PORT
@ -56,30 +53,37 @@ trap 'for new_dir in `dir -d /mnt/*dir`; do umount $new_dir; rm -rf $new_dir; do
sleep 1 sleep 1
echo "Test error injection"
$rpc_py bdev_inject_error 'all' -n 1000 $rpc_py bdev_inject_error 'all' -n 1000
devs=$(iscsiadm -m session -P 3 | grep "Attached scsi disk" | awk '{print $4}') dev=$(iscsiadm -m session -P 3 | grep "Attached scsi disk" | awk '{print $4}')
declare -i failcount=0
set +e set +e
for dev in $devs; do
mkfs.ext4 -F /dev/$dev mkfs.ext4 -F /dev/$dev
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "mkfs successful" echo "mkfs successful - expected failure"
iscsicleanup
killprocess $pid
rm -f $testdir/iscsi.conf
exit 1
else else
echo "mkfs failed" echo "mkfs failed as expected"
failcount+=1
fi fi
done
set -e set -e
if [ $failcount -eq 1 ]; then $rpc_py bdev_inject_error 'clear'
echo "error injection success" echo "Error injection test done"
else
exit 1 iscsicleanup
if [ -z "$NO_NVME" ]; then
$rpc_py construct_target_node Target1 Target1_alias Nvme0n1:0 1:2 64 1 0 0 0
fi fi
$rpc_py bdev_inject_error 'clear' iscsiadm -m discovery -t sendtargets -p $TARGET_IP:$PORT
iscsiadm -m node --login -p $TARGET_IP:$PORT
devs=$(iscsiadm -m session -P 3 | grep "Attached scsi disk" | awk '{print $4}')
for dev in $devs; do for dev in $devs; do
mkfs.ext4 -F /dev/$dev mkfs.ext4 -F /dev/$dev