546a114847
By the following change, delete bdev operation will wait until all
related iSCSI connections exit.
scsi: Don't free IO channel at LUN removal not by allocator
Hence delete bdev must be called after iscsicleanup in test code.
The following patch tried to do that. However nightly test code was
missed to change.
test/iscsi: Change the order of delete_bdev that hides uncorrect
hotplug implementation.
This patch fixes the failure of nightly test. By this patch passing
iSCSI nightly test was verified.
Change-Id: Ia3ac234db6d569212de9234b7201b132236b5993
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/417376
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
124 lines
3.2 KiB
Bash
Executable File
124 lines
3.2 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
testdir=$(readlink -f $(dirname $0))
|
|
rootdir=$(readlink -f $testdir/../../..)
|
|
source $rootdir/test/common/autotest_common.sh
|
|
source $rootdir/test/iscsi_tgt/common.sh
|
|
|
|
if [ ! -z $1 ]; then
|
|
DPDK_DIR=$(readlink -f $1)
|
|
fi
|
|
|
|
timing_enter ext4test
|
|
|
|
cp $testdir/iscsi.conf.in $testdir/iscsi.conf
|
|
$rootdir/scripts/gen_nvme.sh >> $testdir/iscsi.conf
|
|
|
|
|
|
rpc_py="python $rootdir/scripts/rpc.py"
|
|
|
|
timing_enter start_iscsi_tgt
|
|
|
|
$ISCSI_APP -c $testdir/iscsi.conf &
|
|
pid=$!
|
|
echo "Process pid: $pid"
|
|
|
|
trap "killprocess $pid; exit 1" SIGINT SIGTERM EXIT
|
|
|
|
waitforlisten $pid
|
|
echo "iscsi_tgt is listening. Running tests..."
|
|
|
|
timing_exit start_iscsi_tgt
|
|
|
|
$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
|
|
$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
|
|
$rpc_py construct_error_bdev 'Malloc0'
|
|
# "1:2" ==> map PortalGroup1 to InitiatorGroup2
|
|
# "64" ==> iSCSI queue depth 64
|
|
# "-d" ==> disable CHAP authentication
|
|
$rpc_py construct_target_node Target0 Target0_alias EE_Malloc0:0 1:2 64 -d
|
|
sleep 1
|
|
|
|
iscsiadm -m discovery -t sendtargets -p $TARGET_IP:$ISCSI_PORT
|
|
iscsiadm -m node --login -p $TARGET_IP:$ISCSI_PORT
|
|
|
|
trap 'for new_dir in `dir -d /mnt/*dir`; do umount $new_dir; rm -rf $new_dir; done; \
|
|
iscsicleanup; killprocess $pid; exit 1' SIGINT SIGTERM EXIT
|
|
|
|
sleep 1
|
|
|
|
echo "Test error injection"
|
|
$rpc_py bdev_inject_error EE_Malloc0 'all' 'failure' -n 1000
|
|
|
|
dev=$(iscsiadm -m session -P 3 | grep "Attached scsi disk" | awk '{print $4}')
|
|
|
|
set +e
|
|
mkfs.ext4 -F /dev/$dev
|
|
if [ $? -eq 0 ]; then
|
|
echo "mkfs successful - expected failure"
|
|
iscsicleanup
|
|
killprocess $pid
|
|
rm -f $testdir/iscsi.conf
|
|
exit 1
|
|
else
|
|
echo "mkfs failed as expected"
|
|
fi
|
|
set -e
|
|
|
|
$rpc_py bdev_inject_error EE_Malloc0 'clear' 'failure'
|
|
echo "Error injection test done"
|
|
|
|
iscsicleanup
|
|
|
|
if [ -z "$NO_NVME" ]; then
|
|
$rpc_py construct_target_node Target1 Target1_alias Nvme0n1:0 1:2 64 -d
|
|
fi
|
|
|
|
iscsiadm -m discovery -t sendtargets -p $TARGET_IP:$ISCSI_PORT
|
|
iscsiadm -m node --login -p $TARGET_IP:$ISCSI_PORT
|
|
|
|
devs=$(iscsiadm -m session -P 3 | grep "Attached scsi disk" | awk '{print $4}')
|
|
|
|
for dev in $devs; do
|
|
mkfs.ext4 -F /dev/$dev
|
|
mkdir -p /mnt/${dev}dir
|
|
mount -o sync /dev/$dev /mnt/${dev}dir
|
|
|
|
rsync -qav --exclude=".git" $rootdir/ /mnt/${dev}dir/spdk
|
|
|
|
make -C /mnt/${dev}dir/spdk clean
|
|
(cd /mnt/${dev}dir/spdk && ./configure $config_params)
|
|
make -C /mnt/${dev}dir/spdk -j16
|
|
|
|
# Print out space consumed on target device to help decide
|
|
# if/when we need to increase the size of the malloc LUN
|
|
df -h /dev/$dev
|
|
|
|
rm -rf /mnt/${dev}dir/spdk
|
|
done
|
|
|
|
for dev in $devs; do
|
|
umount /mnt/${dev}dir
|
|
rm -rf /mnt/${dev}dir
|
|
|
|
stats=( $(cat /sys/block/$dev/stat) )
|
|
echo ""
|
|
echo "$dev stats"
|
|
printf "READ IO cnt: % 8u merges: % 8u sectors: % 8u ticks: % 8u\n" \
|
|
${stats[0]} ${stats[1]} ${stats[2]} ${stats[3]}
|
|
printf "WRITE IO cnt: % 8u merges: % 8u sectors: % 8u ticks: % 8u\n" \
|
|
${stats[4]} ${stats[5]} ${stats[6]} ${stats[7]}
|
|
printf "in flight: % 8u io ticks: % 8u time in queue: % 8u\n" \
|
|
${stats[8]} ${stats[9]} ${stats[10]}
|
|
echo ""
|
|
done
|
|
|
|
trap - SIGINT SIGTERM EXIT
|
|
|
|
rm -f $testdir/iscsi.conf
|
|
iscsicleanup
|
|
$rpc_py delete_error_bdev EE_Malloc0
|
|
killprocess $pid
|
|
report_test_completion "nightly_iscsi_ext4test"
|
|
timing_exit ext4test
|