From bfdb9de3f0151fe92cc576618067a9f620afb467 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Thu, 1 Apr 2021 14:38:12 +0200 Subject: [PATCH] test/vhost: Extend fio runtime during migration tests Migration can take longer than 10s, hence we need to give fio more time to spin in order to make sure it's still running on the target vm after migration is complete. On the other hand, reduce the timeout used to wait for fio after the migration is done - there's no need to wait almost a minute, half that time. Signed-off-by: Michal Berger Change-Id: I1b53682d5c8bc72336a9eead28c395f97cd81fe7 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7199 Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Tomasz Zawadzki Reviewed-by: Karol Latecki --- test/vhost/migration/migration-tc1.job | 2 +- test/vhost/migration/migration-tc1.sh | 2 +- test/vhost/migration/migration-tc2.job | 2 +- test/vhost/migration/migration-tc2.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/vhost/migration/migration-tc1.job b/test/vhost/migration/migration-tc1.job index 5383b243f..3cd57c90b 100644 --- a/test/vhost/migration/migration-tc1.job +++ b/test/vhost/migration/migration-tc1.job @@ -20,6 +20,6 @@ stonewall [randread] rw=randread -runtime=10 +runtime=20 time_based stonewall diff --git a/test/vhost/migration/migration-tc1.sh b/test/vhost/migration/migration-tc1.sh index 0e56a835a..3ad86bd5c 100644 --- a/test/vhost/migration/migration-tc1.sh +++ b/test/vhost/migration/migration-tc1.sh @@ -93,7 +93,7 @@ function migration_tc1() { fi notice "Waiting for fio to finish" - local timeout=40 + local timeout=20 while is_fio_running $target_vm; do sleep 1 echo -n "." diff --git a/test/vhost/migration/migration-tc2.job b/test/vhost/migration/migration-tc2.job index df78a3cd6..de8d764cd 100644 --- a/test/vhost/migration/migration-tc2.job +++ b/test/vhost/migration/migration-tc2.job @@ -15,6 +15,6 @@ verify_backlog=8 [randwrite] rw=randwrite -runtime=15 +runtime=20 time_based stonewall diff --git a/test/vhost/migration/migration-tc2.sh b/test/vhost/migration/migration-tc2.sh index 9f1e4d48b..7f004c3e9 100644 --- a/test/vhost/migration/migration-tc2.sh +++ b/test/vhost/migration/migration-tc2.sh @@ -186,7 +186,7 @@ function migration_tc2() { fi notice "Waiting for fio to finish" - local timeout=40 + local timeout=20 while is_fio_running $target_vm; do sleep 1 echo -n "."