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

test: clean up redundant process_core invocations

Browse Source 
The main autotest.sh script automatically runs process_core as needed.
Individual test scripts should not be calling it.

Change-Id: I19d8799cd39f37f4768d8d89d3ece6aa993a6c95
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2017-01-27 15:10:58 -07:00
parent b33a298dd7
commit 378fc7787c
7 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/iscsi_tgt/calsoft/calsoft.sh
View File

@ -35,7 +35,7 @@ cp $testdir/auth.conf /usr/local/etc/
pid=$! pid=$!
echo "Process pid: $pid" echo "Process pid: $pid"
trap "process_core; killprocess $pid; exit 1 " SIGINT SIGTERM EXIT trap "killprocess $pid; exit 1 " SIGINT SIGTERM EXIT
waitforlisten $pid ${RPC_PORT} waitforlisten $pid ${RPC_PORT}
echo "iscsi_tgt is listening. Running tests..." echo "iscsi_tgt is listening. Running tests..."

4
test/iscsi_tgt/filesystem/filesystem.sh
View File

@ -31,7 +31,7 @@ rpc_py="python $rootdir/scripts/rpc.py"
pid=$! pid=$!
echo "Process pid: $pid" echo "Process pid: $pid"
trap "process_core; killprocess $pid; exit 1" SIGINT SIGTERM EXIT trap "killprocess $pid; exit 1" SIGINT SIGTERM EXIT
waitforlisten $pid ${RPC_PORT} waitforlisten $pid ${RPC_PORT}
echo "iscsi_tgt is listening. Running tests..." echo "iscsi_tgt is listening. Running tests..."
@ -49,7 +49,7 @@ sleep 1
iscsiadm -m discovery -t sendtargets -p $TARGET_IP:$PORT iscsiadm -m discovery -t sendtargets -p $TARGET_IP:$PORT
iscsiadm -m node --login -p $TARGET_IP:$PORT iscsiadm -m node --login -p $TARGET_IP:$PORT
trap "umount /mnt/device; rm -rf /mnt/device; iscsicleanup; process_core; killprocess $pid; exit 1" SIGINT SIGTERM EXIT trap "umount /mnt/device; rm -rf /mnt/device; iscsicleanup; killprocess $pid; exit 1" SIGINT SIGTERM EXIT
sleep 1 sleep 1

6
test/iscsi_tgt/fio/fio.sh
View File

@ -18,7 +18,7 @@ function running_config() {
./app/iscsi_tgt/iscsi_tgt -c /tmp/iscsi.conf & ./app/iscsi_tgt/iscsi_tgt -c /tmp/iscsi.conf &
pid=$! pid=$!
echo "Process pid: $pid" echo "Process pid: $pid"
trap "iscsicleanup; process_core; killprocess $pid; exit 1" SIGINT SIGTERM EXIT trap "iscsicleanup; killprocess $pid; exit 1" SIGINT SIGTERM EXIT
waitforlisten $pid ${RPC_PORT} waitforlisten $pid ${RPC_PORT}
echo "iscsi_tgt is listening. Running tests..." echo "iscsi_tgt is listening. Running tests..."
@ -54,7 +54,7 @@ fio_py="python $rootdir/scripts/fio.py"
pid=$! pid=$!
echo "Process pid: $pid" echo "Process pid: $pid"
trap "process_core; killprocess $pid; exit 1" SIGINT SIGTERM EXIT trap "killprocess $pid; exit 1" SIGINT SIGTERM EXIT
waitforlisten $pid ${RPC_PORT} waitforlisten $pid ${RPC_PORT}
echo "iscsi_tgt is listening. Running tests..." echo "iscsi_tgt is listening. Running tests..."
@ -72,7 +72,7 @@ sleep 1
iscsiadm -m discovery -t sendtargets -p $TARGET_IP:$PORT iscsiadm -m discovery -t sendtargets -p $TARGET_IP:$PORT
iscsiadm -m node --login -p $TARGET_IP:$PORT iscsiadm -m node --login -p $TARGET_IP:$PORT
trap "iscsicleanup; process_core; killprocess $pid; exit 1" SIGINT SIGTERM EXIT trap "iscsicleanup; killprocess $pid; exit 1" SIGINT SIGTERM EXIT
sleep 1 sleep 1
$fio_py 4096 1 randrw 1 verify $fio_py 4096 1 randrw 1 verify

4
test/iscsi_tgt/idle_migration/idle_migration.sh
View File

@ -26,7 +26,7 @@ fio_py="python $rootdir/scripts/fio.py"
pid=$! pid=$!
echo "Process pid: $pid" echo "Process pid: $pid"
trap "process_core; killprocess $pid; exit 1" SIGINT SIGTERM EXIT trap "killprocess $pid; exit 1" SIGINT SIGTERM EXIT
waitforlisten $pid ${RPC_PORT} waitforlisten $pid ${RPC_PORT}
echo "iscsi_tgt is listening. Running tests..." echo "iscsi_tgt is listening. Running tests..."
@ -38,7 +38,7 @@ sleep 1
iscsiadm -m discovery -t sendtargets -p $TARGET_IP:$PORT iscsiadm -m discovery -t sendtargets -p $TARGET_IP:$PORT
iscsiadm -m node --login -p $TARGET_IP:$PORT iscsiadm -m node --login -p $TARGET_IP:$PORT
trap "iscsicleanup; process_core; killprocess $pid; exit 1" SIGINT SIGTERM EXIT trap "iscsicleanup; killprocess $pid; exit 1" SIGINT SIGTERM EXIT
sleep 5 sleep 5

4
test/iscsi_tgt/reset/reset.sh
View File

@ -38,7 +38,7 @@ fi
pid=$! pid=$!
echo "Process pid: $pid" echo "Process pid: $pid"
trap "process_core; killprocess $pid; exit 1" SIGINT SIGTERM EXIT trap "killprocess $pid; exit 1" SIGINT SIGTERM EXIT
waitforlisten $pid ${RPC_PORT} waitforlisten $pid ${RPC_PORT}
echo "iscsi_tgt is listening. Running tests..." echo "iscsi_tgt is listening. Running tests..."
@ -63,7 +63,7 @@ $fio_py 512 1 read 60 &
fiopid=$! fiopid=$!
echo "FIO pid: $fiopid" echo "FIO pid: $fiopid"
trap "iscsicleanup; process_core; killprocess $pid; killprocess $fiopid; exit 1" SIGINT SIGTERM EXIT trap "iscsicleanup; killprocess $pid; killprocess $fiopid; exit 1" SIGINT SIGTERM EXIT
# Do 3 resets while making sure iscsi_tgt and fio are still running # Do 3 resets while making sure iscsi_tgt and fio are still running
for i in 1 2 3; do for i in 1 2 3; do

2
test/iscsi_tgt/rpc_config/rpc_config.sh
View File

@ -33,7 +33,7 @@ rpc_config_py="python $testdir/rpc_config.py"
pid=$! pid=$!
echo "Process pid: $pid" echo "Process pid: $pid"
trap "process_core; killprocess $pid; exit 1" SIGINT SIGTERM EXIT trap "killprocess $pid; exit 1" SIGINT SIGTERM EXIT
waitforlisten $pid ${RPC_PORT} waitforlisten $pid ${RPC_PORT}
echo "iscsi_tgt is listening. Running tests..." echo "iscsi_tgt is listening. Running tests..."

5
test/lib/bdev/blockdev.sh
View File

@ -12,12 +12,10 @@ timing_enter blockdev
timing_enter bounds timing_enter bounds
$testdir/bdevio/bdevio $testdir/bdev.conf $testdir/bdevio/bdevio $testdir/bdev.conf
process_core
timing_exit bounds timing_exit bounds
timing_enter verify timing_enter verify
$testdir/bdevperf/bdevperf -c $testdir/bdev.conf -q 32 -s 4096 -w verify -t 5 $testdir/bdevperf/bdevperf -c $testdir/bdev.conf -q 32 -s 4096 -w verify -t 5
process_core
timing_exit verify timing_exit verify
if [ $RUN_NIGHTLY -eq 1 ]; then if [ $RUN_NIGHTLY -eq 1 ]; then
@ -25,17 +23,14 @@ if [ $RUN_NIGHTLY -eq 1 ]; then
# size and will cross 128KB Intel DC P3700 stripe boundaries. # size and will cross 128KB Intel DC P3700 stripe boundaries.
timing_enter perf timing_enter perf
$testdir/bdevperf/bdevperf -c $testdir/bdev.conf -q 128 -w read -s 196608 -t 5 $testdir/bdevperf/bdevperf -c $testdir/bdev.conf -q 128 -w read -s 196608 -t 5
process_core
timing_exit perf timing_exit perf
timing_enter reset timing_enter reset
$testdir/bdevperf/bdevperf -c $testdir/bdev.conf -q 16 -w reset -s 4096 -t 60 $testdir/bdevperf/bdevperf -c $testdir/bdev.conf -q 16 -w reset -s 4096 -t 60
process_core
timing_exit reset timing_exit reset
timing_enter unmap timing_enter unmap
$testdir/bdevperf/bdevperf -c $testdir/bdev.conf -q 1 -w unmap -s 4096 -t 60 $testdir/bdevperf/bdevperf -c $testdir/bdev.conf -q 1 -w unmap -s 4096 -t 60
process_core
timing_exit unmap timing_exit unmap
fi fi