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

test/vhost: Reduce time needed to wait for vm boot in vhost tests.

Browse Source 
Help to fix #695

Change-Id: I102ab6f7a19c50a128899178517d323f62a39945
Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/449008
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Pawel Kaminski 2019-03-25 09:14:55 -04:00 committed by Darek Stojaczyk
parent 25dbb5f837
commit 8228a208a6
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/vhost/fiotest/autotest.sh
View File

@ -149,7 +149,7 @@ done
# Run everything
vm_run $used_vms
vm_wait_for_boot 600 $used_vms
vm_wait_for_boot 300 $used_vms
if [[ $test_type == "spdk_vhost_scsi" ]]; then
for vm_conf in ${vms[@]}; do

2
test/vhost/hotplug/common.sh
View File

@ -99,7 +99,7 @@ function vms_setup() {
function vm_run_with_arg() {
vm_run $@
vm_wait_for_boot 600 $@
vm_wait_for_boot 300 $@
}
function vms_setup_and_run() {

2
test/vhost/initiator/blockdev.sh
View File

@ -142,7 +142,7 @@ vm_setup --disk-type=spdk_vhost_scsi --force=$vm_no --os=$os_image \
vm_run $vm_no
timing_enter vm_wait_for_boot
vm_wait_for_boot 600 $vm_no
vm_wait_for_boot 300 $vm_no
timing_exit vm_wait_for_boot
timing_enter vm_scp_spdk

2
test/vhost/integrity/integrity_start.sh
View File

@ -80,7 +80,7 @@ $setup_cmd
# Run VM
vm_run 0
vm_wait_for_boot 600 0
vm_wait_for_boot 300 0
# Run tests on VM
vm_scp 0 $INTEGRITY_BASE_DIR/integrity_vm.sh root@127.0.0.1:/root/integrity_vm.sh

2
test/vhost/lvol/lvol_test.sh
View File

@ -221,7 +221,7 @@ $rpc_py get_vhost_controllers
# Run VMs
vm_run $used_vms
vm_wait_for_boot 600 $used_vms
vm_wait_for_boot 300 $used_vms
# Get disk names from VMs and run FIO traffic

2
test/vhost/migration/migration-tc1.sh
View File

@ -68,7 +68,7 @@ function migration_tc1()
vm_run $incoming_vm $target_vm
# Wait only for incoming VM, as target is waiting for migration
vm_wait_for_boot 600 $incoming_vm
vm_wait_for_boot 300 $incoming_vm
# Run fio before migration
notice "Starting FIO"

2
test/vhost/migration/migration-tc2.sh
View File

@ -140,7 +140,7 @@ function migration_tc2_configure_vhost()
vm_run $incoming_vm $target_vm
# Wait only for incoming VM, as target is waiting for migration
vm_wait_for_boot 600 $incoming_vm
vm_wait_for_boot 300 $incoming_vm
notice "Configuration done"

6
test/vhost/readonly/readonly.sh
View File

@ -88,7 +88,7 @@ function blk_ro_tc1()
vm_setup --disk-type=spdk_vhost_blk --force=$vm_no --os=$vm_img --disks=$disk --read-only=true
vm_run $vm_no
vm_wait_for_boot 600 $vm_no
vm_wait_for_boot 300 $vm_no
notice "Preparing partition and file on guest VM"
vm_ssh $vm_no "bash -s" < $READONLY_BASE_DIR/disabled_readonly_vm.sh
sleep 1
@ -100,7 +100,7 @@ function blk_ro_tc1()
$rpc_py construct_vhost_blk_controller -r $vhost_blk_name $disk_name
vm_run $vm_no
vm_wait_for_boot 600 $vm_no
vm_wait_for_boot 300 $vm_no
notice "Testing readonly feature on guest VM"
vm_ssh $vm_no "bash -s" < $READONLY_BASE_DIR/enabled_readonly_vm.sh
sleep 3
@ -112,7 +112,7 @@ function blk_ro_tc1()
$rpc_py construct_vhost_blk_controller $vhost_blk_name $disk_name
vm_run $vm_no
vm_wait_for_boot 600 $vm_no
vm_wait_for_boot 300 $vm_no
notice "Removing partition and file from test disk on guest VM"
vm_ssh $vm_no "bash -s" < $READONLY_BASE_DIR/delete_partition_vm.sh
sleep 1

2
test/vhost/vhost_boot/vhost_boot.sh
View File

@ -85,7 +85,7 @@ timing_exit create_vhost_controller
timing_enter setup_vm
vm_setup --disk-type=spdk_vhost_scsi --force=$vm_no --disks="vhost_vm" --spdk-boot="vhost_vm"
vm_run $vm_no
vm_wait_for_boot 600 $vm_no
vm_wait_for_boot 300 $vm_no
timing_exit setup_vm
timing_enter run_vm_cmd