Commit 74185371 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki Committed by Jim Harris
Browse files

test/iscsi: remove duplicate fuzzing test 



Both autofuzz_iscsi.sh and fuzz.sh are the same.
The difference is passing the time to fuzz and
minor difference in how the application was started.

Removed fuzz.sh which was called directly in per-patch
autotest for short period of 30 sec. Replaced it with call
to autofuzz_iscsi.sh with the same timer.

Adjust ISCSI_APP to start in the same way, most importantly
per-patch now won't generate megabytes of logs due to
lack of output redirection in the removed fuzz.sh.

Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I79927a0634d9aa96014f9b589fd2883268ee18f5
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/22518


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKamil Godzwon <kamilx.godzwon@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
parent 5251fc2d

test/fuzz/autofuzz_iscsi.sh

+2 −1
Original line number Diff line number Diff line
@@ -38,8 +38,9 @@ done 


timing_enter start_iscsi_tgt



"${ISCSI_APP[@]}" -m $ISCSI_TEST_CORE_MASK --wait-for-rpc &> $output_dir/iscsi_autofuzz_tgt_output.txt &

"${ISCSI_APP[@]}" -m $ISCSI_TEST_CORE_MASK --disable-cpumask-locks --wait-for-rpc &> $output_dir/iscsi_autofuzz_tgt_output.txt &

iscsipid=$!

echo "Process iscsipid: $iscsipid"



trap 'killprocess $iscsipid; exit 1' SIGINT SIGTERM EXIT

test/iscsi_tgt/fuzz/fuzz.sh

deleted100755 → 0
+0 −64
Original line number Diff line number Diff line 
#!/usr/bin/env bash

#  SPDX-License-Identifier: BSD-3-Clause

#  Copyright (C) 2019 Intel Corporation

#  All rights reserved.

#

testdir=$(readlink -f $(dirname $0))

rootdir=$(readlink -f $testdir/../../..)

source $rootdir/test/common/autotest_common.sh

source $rootdir/test/iscsi_tgt/common.sh



iscsitestinit



if [ -z "$TARGET_IP" ]; then

	echo "TARGET_IP not defined in environment"

	exit 1

fi



if [ -z "$INITIATOR_IP" ]; then

	echo "INITIATOR_IP not defined in environment"

	exit 1

fi



timing_enter iscsi_fuzz



MALLOC_BDEV_SIZE=64

MALLOC_BLOCK_SIZE=4096



timing_enter start_iscsi_tgt



"${ISCSI_APP[@]}" -m $ISCSI_TEST_CORE_MASK --disable-cpumask-locks --wait-for-rpc &

iscsipid=$!

echo "Process iscsipid: $iscsipid"



trap 'killprocess $iscsipid; exit 1' SIGINT SIGTERM EXIT



waitforlisten $iscsipid

# Fuzz initiator do not support nop-in yet. So we increase nop-in timeout value for now.

$rpc_py iscsi_set_options -o 60 -a 16

$rpc_py framework_start_init

echo "iscsi_tgt is listening. Running tests..."

timing_exit start_iscsi_tgt



$rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT

$rpc_py iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK

$rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE

$rpc_py iscsi_create_target_node disk1 disk1_alias 'Malloc0:0' $PORTAL_TAG:$INITIATOR_TAG 256 -d

sleep 1



trap 'killprocess $iscsipid; iscsitestfini; exit 1' SIGINT SIGTERM EXIT



$rootdir/test/app/fuzz/iscsi_fuzz/iscsi_fuzz -m 0xF0 -T $TARGET_IP -t 30 2> $output_dir/iscsi_autofuzz_logs.txt



$rpc_py iscsi_delete_target_node 'iqn.2016-06.io.spdk:disk1'



# Delete malloc device

$rpc_py bdev_malloc_delete Malloc0



trap - SIGINT SIGTERM EXIT



killprocess $iscsipid



iscsitestfini



timing_exit iscsi_fuzz

test/iscsi_tgt/iscsi_tgt.sh

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ run_test "iscsi_tgt_ip_migration" $rootdir/test/iscsi_tgt/ip_migration/ip_migrat 
run_test "iscsi_tgt_trace_record" $rootdir/test/iscsi_tgt/trace_record/trace_record.sh

run_test "iscsi_tgt_login_redirection" $rootdir/test/iscsi_tgt/login_redirection/login_redirection.sh

run_test "iscsi_tgt_digests" $rootdir/test/iscsi_tgt/digests/digests.sh

run_test "iscsi_tgt_fuzz" $rootdir/test/iscsi_tgt/fuzz/fuzz.sh

run_test "iscsi_tgt_fuzz" $rootdir/test/fuzz/autofuzz_iscsi.sh --timeout=30

run_test "iscsi_tgt_multiconnection" $rootdir/test/iscsi_tgt/multiconnection/multiconnection.sh



if [ $RUN_NIGHTLY -eq 1 ]; then