Commit c7a40fcb authored Jul 20, 2023 by Michal Berger Committed by Tomasz Zawadzki Jul 28, 2023

test/vhost: Make sure reboot over ssh does not block



In case it does, it can force vm_os_booted() to enter infinite loop
at the time ssh finally returns (since the VM would be back online
at that time).

Make sure reboot is forced and that ssh will bail as soon as the
remote end stops being online.

Change-Id: Ib4494edd44352a2069e359e03b4380669096112a
Signed-off-by: Michal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/19158


Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Pawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Marek Chomnicki <marek.chomnicki@intel.com>

parent 5982e1f0

test/vhost/hotplug/common.sh

+1 −4

Original line number	Diff line number	Diff line
		@@ -139,10 +139,7 @@ function vms_prepare() {
		function vms_reboot_all() {
		notice "Rebooting all vms "
		for vm_num in $1; do
		vm_exec $vm_num "reboot" \|\| true
		while vm_os_booted $vm_num; do
		sleep 0.5
		done
		VM_SSH_OPTIONS="-oServerAliveInterval=1" vm_exec $vm_num "reboot -f" \|\| true
		done

		vm_wait_for_boot 300 $1