From e8c73275333df7907a68a76c0e8fa1b42d103a70 Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Thu, 17 Sep 2020 15:48:52 -0700 Subject: [PATCH] test/iscsi: In ip_migration.sh, don't run both targets on the same core This fixes a 3+ year old TODO Change-Id: I2516586d120b0f6f8d3d0fc54a5ebdd93aae6bc2 Signed-off-by: Ben Walker Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4300 Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Tomasz Zawadzki --- test/iscsi_tgt/ip_migration/ip_migration.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/iscsi_tgt/ip_migration/ip_migration.sh b/test/iscsi_tgt/ip_migration/ip_migration.sh index 78c653a12..e762e6a19 100755 --- a/test/iscsi_tgt/ip_migration/ip_migration.sh +++ b/test/iscsi_tgt/ip_migration/ip_migration.sh @@ -76,9 +76,9 @@ function rpc_add_target_node() { function iscsi_tgt_start() { # $1 = RPC server address + # $2 = Core Mask - # TODO: run the different iSCSI instances on non-overlapping CPU masks - "${ISCSI_APP[@]}" -r $1 -m $ISCSI_TEST_CORE_MASK --wait-for-rpc & + "${ISCSI_APP[@]}" -r $1 -m $2 --wait-for-rpc & pid=$! echo "Process pid: $pid" @@ -99,8 +99,9 @@ for ((i = 0; i < 2; i++)); do timing_enter start_iscsi_tgt_$i rpc_addr="/var/tmp/spdk${i}.sock" + mask=$((1 << i)) - iscsi_tgt_start $rpc_addr + iscsi_tgt_start $rpc_addr $mask timing_exit start_iscsi_tgt_$i done