Commit 7c347821 authored by Jim Harris's avatar Jim Harris Committed by Ben Walker
Browse files

test/iscsi_tgt: add timing for iscsi_tgt app startup 



Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: Ic05849d9381709340016f05148118173709ec152

Reviewed-on: https://review.gerrithub.io/362612


Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Tested-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 8933ba21

test/iscsi_tgt/calsoft/calsoft.sh

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ mkdir -p /usr/local/etc 
cp $testdir/its.conf /usr/local/etc/

cp $testdir/auth.conf /usr/local/etc/



timing_enter start_iscsi_tgt



$ISCSI_APP -c $testdir/iscsi.conf -m 0x1 &

pid=$!

echo "Process pid: $pid"
@@ -37,6 +39,8 @@ trap "killprocess $pid; exit 1 " SIGINT SIGTERM EXIT 
waitforlisten $pid ${RPC_PORT}

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



timing_exit start_iscsi_tgt



$rpc_py add_portal_group 1 $TARGET_IP:$PORT

$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK

$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE

test/iscsi_tgt/ext4test/ext4test.sh

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ NETMASK=$INITIATOR_IP/32 


rpc_py="python $rootdir/scripts/rpc.py"



timing_enter start_iscsi_tgt



$ISCSI_APP -c $testdir/iscsi.conf &

pid=$!

echo "Process pid: $pid"
@@ -32,6 +34,8 @@ trap "killprocess $pid; exit 1" SIGINT SIGTERM EXIT 
waitforlisten $pid ${RPC_PORT}

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



timing_exit start_iscsi_tgt



$rpc_py add_portal_group 1 $TARGET_IP:$PORT

$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK

$rpc_py construct_error_bdev 'Malloc0'

test/iscsi_tgt/filesystem/filesystem.sh

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ MALLOC_BLOCK_SIZE=512 


rpc_py="python $rootdir/scripts/rpc.py"



timing_enter start_iscsi_tgt



$ISCSI_APP -c $testdir/iscsi.conf -m 0xFFFF &

pid=$!

echo "Process pid: $pid"
@@ -27,6 +29,8 @@ trap "killprocess $pid; exit 1" SIGINT SIGTERM EXIT 
waitforlisten $pid ${RPC_PORT}

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



timing_exit start_iscsi_tgt



$rpc_py add_portal_group 1 $TARGET_IP:$PORT

$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK

$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE

test/iscsi_tgt/fio/fio.sh

+9 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ function running_config() { 
	#  config file matched the running configuration

	killprocess $pid

	trap "iscsicleanup; exit 1" SIGINT SIGTERM EXIT



	timing_enter start_iscsi_tgt2



	$ISCSI_APP -c /tmp/iscsi.conf &

	pid=$!

	echo "Process pid: $pid"
@@ -23,6 +26,8 @@ function running_config() { 
	waitforlisten $pid ${RPC_PORT}

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



	timing_exit start_iscsi_tgt2



	sleep 1

	$fio_py 4096 1 randrw 5

}
@@ -54,6 +59,8 @@ MALLOC_BLOCK_SIZE=4096 
rpc_py="python $rootdir/scripts/rpc.py"

fio_py="python $rootdir/scripts/fio.py"



timing_enter start_iscsi_tgt



$ISCSI_APP -c $testdir/iscsi.conf &

pid=$!

echo "Process pid: $pid"
@@ -63,6 +70,8 @@ trap "killprocess $pid; exit 1" SIGINT SIGTERM EXIT 
waitforlisten $pid ${RPC_PORT}

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



timing_exit start_iscsi_tgt



$rpc_py add_portal_group 1 $TARGET_IP:$PORT

$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK

$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE

test/iscsi_tgt/idle_migration/idle_migration.sh

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ RPC_PORT=5260 


fio_py="python $rootdir/scripts/fio.py"



timing_enter start_iscsi_tgt



$ISCSI_APP -c $testdir/iscsi.conf -m 0xFFFF &

pid=$!

echo "Process pid: $pid"
@@ -22,6 +24,8 @@ trap "killprocess $pid; exit 1" SIGINT SIGTERM EXIT 
waitforlisten $pid ${RPC_PORT}

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



timing_exit start_iscsi_tgt



$testdir/build_configuration.sh



sleep 1