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

test/iscsi: don't use set +e

Browse Source 
We used `set +e` before bdev deletion RPCs and
`wait $fio_pid`. Disabling errors from those RPCs
doesn't make sense. We expect FIO to fail due to
bdev hotremoval, but the bdev hotremoval itself
must succeed.

Besides, it's easy to forget to undo `set +e` so
don't use it. For `wait` we can use the following
paradigm instead:

```
rc=0
wait $pid || rc=$?
```

Change-Id: I8716bd861eae85d7a8590d4bd26a65cfa10e0dc1
Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/457469
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Darek Stojaczyk 2019-06-10 11:52:24 +02:00
parent 1a8ee925b0
commit 4cc2d1d814
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/iscsi_tgt/fio/fio.sh
View File

@ -114,25 +114,23 @@ $fio_py -p iscsi -i 1048576 -d 128 -t rw -r 10 &
fio_pid=$! fio_pid=$!
sleep 3 sleep 3
set +e
# Delete raid0, Malloc0, Malloc1 blockdevs # Delete raid0, Malloc0, Malloc1 blockdevs
$rpc_py destroy_raid_bdev 'raid0' $rpc_py destroy_raid_bdev 'raid0'
$rpc_py delete_malloc_bdev 'Malloc0' $rpc_py delete_malloc_bdev 'Malloc0'
$rpc_py delete_malloc_bdev 'Malloc1' $rpc_py delete_malloc_bdev 'Malloc1'
wait $fio_pid fio_status=0
fio_status=$? wait $fio_pid || fio_status=$?
if [ $fio_status -eq 0 ]; then if [ $fio_status -eq 0 ]; then
echo "iscsi hotplug test: fio successful - expected failure" echo "iscsi hotplug test: fio successful - expected failure"
set -e
exit 1 exit 1
else else
echo "iscsi hotplug test: fio failed as expected" echo "iscsi hotplug test: fio failed as expected"
fi fi
set -e
iscsicleanup iscsicleanup
$rpc_py delete_target_node 'iqn.2016-06.io.spdk:Target3' $rpc_py delete_target_node 'iqn.2016-06.io.spdk:Target3'