From 8228a208a67dd3873182480b3ca13466a1a47065 Mon Sep 17 00:00:00 2001 From: Pawel Kaminski Date: Mon, 25 Mar 2019 09:14:55 -0400 Subject: [PATCH] test/vhost: Reduce time needed to wait for vm boot in vhost tests. Help to fix #695 Change-Id: I102ab6f7a19c50a128899178517d323f62a39945 Signed-off-by: Pawel Kaminski Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/449008 Reviewed-by: Karol Latecki Reviewed-by: Darek Stojaczyk Reviewed-by: Ben Walker Tested-by: SPDK CI Jenkins --- test/vhost/fiotest/autotest.sh | 2 +- test/vhost/hotplug/common.sh | 2 +- test/vhost/initiator/blockdev.sh | 2 +- test/vhost/integrity/integrity_start.sh | 2 +- test/vhost/lvol/lvol_test.sh | 2 +- test/vhost/migration/migration-tc1.sh | 2 +- test/vhost/migration/migration-tc2.sh | 2 +- test/vhost/readonly/readonly.sh | 6 +++--- test/vhost/vhost_boot/vhost_boot.sh | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/test/vhost/fiotest/autotest.sh b/test/vhost/fiotest/autotest.sh index 32566cbd3..c19648636 100755 --- a/test/vhost/fiotest/autotest.sh +++ b/test/vhost/fiotest/autotest.sh @@ -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 diff --git a/test/vhost/hotplug/common.sh b/test/vhost/hotplug/common.sh index f4e2b9090..31debaff3 100644 --- a/test/vhost/hotplug/common.sh +++ b/test/vhost/hotplug/common.sh @@ -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() { diff --git a/test/vhost/initiator/blockdev.sh b/test/vhost/initiator/blockdev.sh index b5ec3015c..cba90b53a 100755 --- a/test/vhost/initiator/blockdev.sh +++ b/test/vhost/initiator/blockdev.sh @@ -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 diff --git a/test/vhost/integrity/integrity_start.sh b/test/vhost/integrity/integrity_start.sh index a9899e9f1..cfda9421d 100755 --- a/test/vhost/integrity/integrity_start.sh +++ b/test/vhost/integrity/integrity_start.sh @@ -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 diff --git a/test/vhost/lvol/lvol_test.sh b/test/vhost/lvol/lvol_test.sh index 5190b5f28..0b665679b 100755 --- a/test/vhost/lvol/lvol_test.sh +++ b/test/vhost/lvol/lvol_test.sh @@ -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 diff --git a/test/vhost/migration/migration-tc1.sh b/test/vhost/migration/migration-tc1.sh index ec89545d1..c6ae1d98b 100644 --- a/test/vhost/migration/migration-tc1.sh +++ b/test/vhost/migration/migration-tc1.sh @@ -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" diff --git a/test/vhost/migration/migration-tc2.sh b/test/vhost/migration/migration-tc2.sh index bc4a0f531..c39678aa7 100644 --- a/test/vhost/migration/migration-tc2.sh +++ b/test/vhost/migration/migration-tc2.sh @@ -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" diff --git a/test/vhost/readonly/readonly.sh b/test/vhost/readonly/readonly.sh index d0b7968fc..3d7f15efa 100755 --- a/test/vhost/readonly/readonly.sh +++ b/test/vhost/readonly/readonly.sh @@ -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 diff --git a/test/vhost/vhost_boot/vhost_boot.sh b/test/vhost/vhost_boot/vhost_boot.sh index 4ec480afd..f2548969c 100755 --- a/test/vhost/vhost_boot/vhost_boot.sh +++ b/test/vhost/vhost_boot/vhost_boot.sh @@ -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