687a9ab516
When we conduct the ip migration test (i.e., switch the iSCSI target process from to first process to second). This time may exceed the 5s in some cases, so FIO process will exit with error and make the test fail. Because The total FIO execution time is 10s, and we sleep 5s in the script. So propose the following approach: 1 Change the sleep from 5s to 3s, we do not need to sleep it too long for FIO. 2 Extend the FIO execution time from 10s to 12s. Signed-off-by: Ziye Yang <ziye.yang@intel.com> Change-Id: I07d488c6e8a94733534acc1acd2ba8778c4d2eb3 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2801 Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
132 lines
3.6 KiB
Bash
Executable File
132 lines
3.6 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
|
|
|
|
# $1 = "iso" - triggers isolation mode (setting up required environment).
|
|
# $2 = test type posix or vpp. defaults to posix.
|
|
iscsitestinit $1 $2
|
|
|
|
rpc_py="$rootdir/scripts/rpc.py"
|
|
fio_py="$rootdir/scripts/fio.py"
|
|
|
|
# Namespaces are NOT used here on purpose. This test requires changes to detect
|
|
# ifc_index for interface that was put into namespace. Needed for net_interface_add_ip_address.
|
|
# Reset ISCSI_APP[] to use only the plain app for this test without TARGET_NS_CMD preset.
|
|
source "$rootdir/test/common/applications.sh"
|
|
NETMASK=127.0.0.0/24
|
|
MIGRATION_ADDRESS=127.0.0.2
|
|
|
|
function kill_all_iscsi_target() {
|
|
for ((i = 0; i < 2; i++)); do
|
|
rpc_addr="/var/tmp/spdk${i}.sock"
|
|
$rpc_py -s $rpc_addr spdk_kill_instance SIGTERM
|
|
done
|
|
}
|
|
|
|
function rpc_config() {
|
|
# $1 = RPC server address
|
|
# $2 = Netmask
|
|
$rpc_py -s $1 iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $2
|
|
$rpc_py -s $1 bdev_malloc_create 64 512
|
|
}
|
|
|
|
function rpc_validate_ip() {
|
|
# Always delete the IP first in case it is there already
|
|
cmd="$rpc_py -s $1 net_interface_delete_ip_address 1 $MIGRATION_ADDRESS"
|
|
if $cmd; then
|
|
echo "Delete existing IP succeeded."
|
|
else
|
|
echo "Ignore the failure as IP did not exist."
|
|
fi
|
|
|
|
cmd="$rpc_py -s $1 net_interface_add_ip_address 1 $MIGRATION_ADDRESS"
|
|
if $cmd; then
|
|
echo "Add new IP succeeded."
|
|
else
|
|
echo "Add new IP failed. Expected to succeed..."
|
|
exit 1
|
|
fi
|
|
# Add same IP again
|
|
if $cmd; then
|
|
echo "Same IP existed. Expected to fail..."
|
|
exit 1
|
|
fi
|
|
|
|
cmd="$rpc_py -s $1 net_interface_delete_ip_address 1 $MIGRATION_ADDRESS"
|
|
if $cmd; then
|
|
echo "Delete existing IP succeeded."
|
|
else
|
|
echo "Delete existing IP failed. Expected to succeed..."
|
|
exit 1
|
|
fi
|
|
# Delete same IP again
|
|
if $cmd; then
|
|
echo "No required IP existed. Expected to fail..."
|
|
exit 1
|
|
fi
|
|
}
|
|
|
|
function rpc_add_target_node() {
|
|
$rpc_py -s $1 net_interface_add_ip_address 1 $MIGRATION_ADDRESS
|
|
$rpc_py -s $1 iscsi_create_portal_group $PORTAL_TAG $MIGRATION_ADDRESS:$ISCSI_PORT
|
|
$rpc_py -s $1 iscsi_create_target_node target1 target1_alias 'Malloc0:0' $PORTAL_TAG:$INITIATOR_TAG 64 -d
|
|
$rpc_py -s $1 net_interface_delete_ip_address 1 $MIGRATION_ADDRESS
|
|
}
|
|
|
|
echo "Running ip migration tests"
|
|
for ((i = 0; i < 2; i++)); do
|
|
timing_enter start_iscsi_tgt_$i
|
|
|
|
rpc_addr="/var/tmp/spdk${i}.sock"
|
|
|
|
# TODO: run the different iSCSI instances on non-overlapping CPU masks
|
|
"${ISCSI_APP[@]}" -r $rpc_addr -i $i -m $ISCSI_TEST_CORE_MASK --wait-for-rpc &
|
|
pid=$!
|
|
echo "Process pid: $pid"
|
|
|
|
trap 'kill_all_iscsi_target; exit 1' SIGINT SIGTERM EXIT
|
|
|
|
waitforlisten $pid $rpc_addr
|
|
$rpc_py -s $rpc_addr iscsi_set_options -o 30 -a 64
|
|
$rpc_py -s $rpc_addr framework_start_init
|
|
echo "iscsi_tgt is listening. Running tests..."
|
|
|
|
timing_exit start_iscsi_tgt_$i
|
|
|
|
rpc_config $rpc_addr $NETMASK
|
|
trap 'kill_all_iscsi_target; iscsitestfini $1 $2; exit 1' \
|
|
SIGINT SIGTERM EXIT
|
|
done
|
|
|
|
rpc_first_addr="/var/tmp/spdk0.sock"
|
|
rpc_validate_ip $rpc_first_addr
|
|
rpc_add_target_node $rpc_first_addr
|
|
|
|
sleep 1
|
|
iscsiadm -m discovery -t sendtargets -p $MIGRATION_ADDRESS:$ISCSI_PORT
|
|
sleep 1
|
|
iscsiadm -m node --login -p $MIGRATION_ADDRESS:$ISCSI_PORT
|
|
waitforiscsidevices 1
|
|
|
|
# fio tests for multi-process
|
|
$fio_py -p iscsi -i 4096 -d 32 -t randrw -r 12 &
|
|
fiopid=$!
|
|
sleep 3
|
|
|
|
$rpc_py -s $rpc_first_addr spdk_kill_instance SIGTERM
|
|
|
|
rpc_second_addr="/var/tmp/spdk1.sock"
|
|
rpc_add_target_node $rpc_second_addr
|
|
|
|
wait $fiopid
|
|
|
|
trap - SIGINT SIGTERM EXIT
|
|
|
|
iscsicleanup
|
|
|
|
$rpc_py -s $rpc_second_addr spdk_kill_instance SIGTERM
|
|
iscsitestfini $1 $2
|