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

test/iscsi_tgt: Port running_config test to JSON config and re-enable it.

Browse Source 
Change-Id: I7619ea8dc94e76934c8ebb37f4248376feaa23ef
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/433200
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Shuhei Matsumoto 2018-11-15 19:23:13 +09:00 committed by Ben Walker
parent a66c9ffd50
commit 78a45b3f45
2 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,13 +6,13 @@ source $rootdir/test/common/autotest_common.sh
source $rootdir/test/iscsi_tgt/common.sh source $rootdir/test/iscsi_tgt/common.sh
delete_tmp_files() { delete_tmp_files() {
rm -f $testdir/iscsi2.json
rm -f ./local-job0-0-verify.state rm -f ./local-job0-0-verify.state
} }
function running_config() { function running_config() {
# generate a config file from the running iscsi_tgt # dump a config file from the running iscsi_tgt
# running_config.sh will leave the file at /tmp/iscsi.conf $rpc_py save_config > $testdir/iscsi2.json
$testdir/running_config.sh $pid
sleep 1 sleep 1
# now start iscsi_tgt again using the generated config file # now start iscsi_tgt again using the generated config file
@ -23,11 +23,14 @@ function running_config() {
timing_enter start_iscsi_tgt2 timing_enter start_iscsi_tgt2
$ISCSI_APP -c /tmp/iscsi.conf & $ISCSI_APP --wait-for-rpc &
pid=$! pid=$!
echo "Process pid: $pid" echo "Process pid: $pid"
trap "iscsicleanup; killprocess $pid; delete_tmp_files; exit 1" SIGINT SIGTERM EXIT trap "iscsicleanup; killprocess $pid; delete_tmp_files; exit 1" SIGINT SIGTERM EXIT
waitforlisten $pid waitforlisten $pid
$rpc_py load_config < $testdir/iscsi2.json
echo "iscsi_tgt is listening. Running tests..." echo "iscsi_tgt is listening. Running tests..."
timing_exit start_iscsi_tgt2 timing_exit start_iscsi_tgt2

22
test/iscsi_tgt/fio/running_config.sh
View File

@ -1,22 +0,0 @@
#!/usr/bin/env bash
set -xe
pid="$1"
if [[ -z "$pid" ]]; then
echo "usage: $0 pid"
exit 1
fi
# delete any existing temporary iscsi.conf files
rm -f /tmp/iscsi.conf*
kill -USR1 "$pid"
if [ ! -f $(ls /tmp/iscsi.conf.*) ]; then
echo "iscsi_tgt did not generate config file"
exit 1
fi
mv $(ls /tmp/iscsi.conf.*) /tmp/iscsi.conf