vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests/qtest: failover: fix infinite loop 

If the migration is over before we cancel it, we are
waiting in a loop a state that never comes because the state
is already "completed".

To avoid an infinite loop, skip the test if the migration
is "completed" before we were able to cancel it.

Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Acked-by: Thomas Huth <thuth@redhat.com>
Message-id: 20220329124259.355995-1-lvivier@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
master
Laurent Vivier 2022-03-29 14:42:59 +02:00 committed by Peter Maydell
parent 44064550d9
commit 6ae6a30ca5
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tests/qtest/virtio-net-failover.c
View File

@ -1141,6 +1141,11 @@ static void test_migrate_guest_off_abort(gconstpointer opaque)
ret = migrate_status(qts);
status = qdict_get_str(ret, "status");
if (strcmp(status, "completed") == 0) {
g_test_skip("Failed to cancel the migration");
qobject_unref(ret);
goto out;
}
if (strcmp(status, "active") == 0) {
qobject_unref(ret);
break;
@ -1155,8 +1160,12 @@ static void test_migrate_guest_off_abort(gconstpointer opaque)
while (true) {
ret = migrate_status(qts);
status = qdict_get_str(ret, "status");
if (strcmp(status, "completed") == 0) {
g_test_skip("Failed to cancel the migration");
qobject_unref(ret);
goto out;
}
if (strcmp(status, "cancelled") == 0) {
qobject_unref(ret);
break;
@ -1169,6 +1178,7 @@ static void test_migrate_guest_off_abort(gconstpointer opaque)
check_one_card(qts, true, "standby0", MAC_STANDBY0);
check_one_card(qts, false, "primary0", MAC_PRIMARY0);
out:
qos_object_destroy((QOSGraphObject *)vdev);
machine_stop(qts);
}
@ -1251,8 +1261,7 @@ static void test_migrate_abort_wait_unplug(gconstpointer opaque)
qobject_unref(ret);
break;
}
g_assert_cmpstr(status, !=, "failed");
g_assert_cmpstr(status, !=, "active");
g_assert_cmpstr(status, ==, "cancelling");
qobject_unref(ret);
}
@ -1324,11 +1333,11 @@ static void test_migrate_abort_active(gconstpointer opaque)
ret = migrate_status(qts);
status = qdict_get_str(ret, "status");
g_assert_cmpstr(status, !=, "failed");
if (strcmp(status, "wait-unplug") != 0) {
qobject_unref(ret);
break;
}
g_assert_cmpstr(status, !=, "failed");
qobject_unref(ret);
}
@ -1340,6 +1349,11 @@ static void test_migrate_abort_active(gconstpointer opaque)
ret = migrate_status(qts);
status = qdict_get_str(ret, "status");
if (strcmp(status, "completed") == 0) {
g_test_skip("Failed to cancel the migration");
qobject_unref(ret);
goto out;
}
if (strcmp(status, "cancelled") == 0) {
qobject_unref(ret);
break;
@ -1352,6 +1366,7 @@ static void test_migrate_abort_active(gconstpointer opaque)
check_one_card(qts, true, "standby0", MAC_STANDBY0);
check_one_card(qts, true, "primary0", MAC_PRIMARY0);
out:
qos_object_destroy((QOSGraphObject *)vdev);
machine_stop(qts);
}
@ -1425,6 +1440,11 @@ static void test_migrate_off_abort(gconstpointer opaque)
ret = migrate_status(qts);
status = qdict_get_str(ret, "status");
if (strcmp(status, "completed") == 0) {
g_test_skip("Failed to cancel the migration");
qobject_unref(ret);
goto out;
}
if (strcmp(status, "cancelled") == 0) {
qobject_unref(ret);
break;
@ -1437,6 +1457,7 @@ static void test_migrate_off_abort(gconstpointer opaque)
check_one_card(qts, true, "standby0", MAC_STANDBY0);
check_one_card(qts, true, "primary0", MAC_PRIMARY0);
out:
qos_object_destroy((QOSGraphObject *)vdev);
machine_stop(qts);
}