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

test/vhost: Modify wait time for vhost start in fiotest

Browse Source 
Look for open RPC port instead of issuing "sleep" for a
number of seconds.

Change-Id: Id75476ae3d6c39de7f7da2c0878d251384c2bb65
Signed-off-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.gerrithub.io/364974
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Karol Latecki 2017-06-12 13:28:52 +02:00 committed by Jim Harris
parent 05fd28399a
commit 5dd160bde6
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
test/vhost/fiotest/common.sh
View File

@ -40,6 +40,17 @@ mkdir -p $TEST_DIR
. $BASE_DIR/autotest.config . $BASE_DIR/autotest.config
RPC_PORT=5260
# Trace flag is optional, if it wasn't set earlier - disable it after sourcing
# autotest_common.sh
if [[ $- =~ x ]]; then
source $SPDK_BUILD_DIR/scripts/autotest_common.sh
else
source $SPDK_BUILD_DIR/scripts/autotest_common.sh
set +x
fi
function error() function error()
{ {
echo "===========" echo "==========="
@ -146,10 +157,10 @@ function spdk_vhost_run()
( cd $SPDK_VHOST_SCSI_TEST_DIR; $cmd & echo $! >&3) 3>$vhost_pid_file 2>&1 | tee -a $vhost_log_file & ( cd $SPDK_VHOST_SCSI_TEST_DIR; $cmd & echo $! >&3) 3>$vhost_pid_file 2>&1 | tee -a $vhost_log_file &
echo "INFO: waiting 25s to allow app to run..." echo "INFO: waiting for app to run..."
sleep 25 local vhost_pid="$(cat $vhost_pid_file)"
kill -0 $(cat $vhost_pid_file) waitforlisten "$vhost_pid" ${RPC_PORT}
echo "INFO: vhost started - pid=$(cat $vhost_pid_file)" echo "INFO: vhost started - pid=$vhost_pid"
rm $vhost_conf_file rm $vhost_conf_file
} }
@ -332,7 +343,7 @@ function vm_shutdown()
# "fail" due to shutdown # "fail" due to shutdown
echo "Shutting down virtual machine $vm_dir" echo "Shutting down virtual machine $vm_dir"
set +e set +e
vm_ssh $1 "nohup sh -c 'shutdown -h -P now'" vm_ssh $1 "nohup sh -c 'shutdown -h -P now'" || true
echo "INFO: VM$1 is shutting down - wait a while to complete" echo "INFO: VM$1 is shutting down - wait a while to complete"
set -e set -e
} }