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

test/iscsi: In ip_migration.sh, put starting the target into a function

Browse Source 
This makes it a bit clearer.

Change-Id: I3e9bcc8d5cff3c4cf85ec774114f84a59a9c0f16
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4299
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Ben Walker 2020-09-17 15:45:27 -07:00 committed by Tomasz Zawadzki
parent 3a2148213f
commit 4eec36511d
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,29 +74,35 @@ function rpc_add_target_node() {
$rpc_py -s $1 net_interface_delete_ip_address 1 $MIGRATION_ADDRESS $rpc_py -s $1 net_interface_delete_ip_address 1 $MIGRATION_ADDRESS
} }
function iscsi_tgt_start() {
# $1 = RPC server address
# TODO: run the different iSCSI instances on non-overlapping CPU masks
"${ISCSI_APP[@]}" -r $1 -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 $1
$rpc_py -s $1 iscsi_set_options -o 30 -a 64
$rpc_py -s $1 framework_start_init
echo "iscsi_tgt is listening. Running tests..."
rpc_config $1 $NETMASK
trap 'kill_all_iscsi_target; iscsitestfini; exit 1' \
SIGINT SIGTERM EXIT
}
echo "Running ip migration tests" echo "Running ip migration tests"
for ((i = 0; i < 2; i++)); do for ((i = 0; i < 2; i++)); do
timing_enter start_iscsi_tgt_$i timing_enter start_iscsi_tgt_$i
rpc_addr="/var/tmp/spdk${i}.sock" rpc_addr="/var/tmp/spdk${i}.sock"
# TODO: run the different iSCSI instances on non-overlapping CPU masks iscsi_tgt_start $rpc_addr
"${ISCSI_APP[@]}" -r $rpc_addr -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 timing_exit start_iscsi_tgt_$i
rpc_config $rpc_addr $NETMASK
trap 'kill_all_iscsi_target; iscsitestfini; exit 1' \
SIGINT SIGTERM EXIT
done done
rpc_first_addr="/var/tmp/spdk0.sock" rpc_first_addr="/var/tmp/spdk0.sock"