Add some tests to check the state of the machine if the migration
is cancelled while we are using virtio-net failover.
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
tests/qtest/virtio-net-failover.c | 291 ++++++++++++++++++++++++++++++
1 file changed, 291 insertions(+)
diff --git a/tests/qtest/virtio-net-failover.c b/tests/qtest/virtio-net-failover.c
index c88f8ddec39a..57abb99e7f6e 100644
--- a/tests/qtest/virtio-net-failover.c
+++ b/tests/qtest/virtio-net-failover.c
@@ -682,6 +682,289 @@ static void test_migrate_in(gconstpointer opaque)
machine_stop(qts);
}
+static void test_migrate_abort_wait_unplug(gconstpointer opaque)
+{
+ QTestState *qts;
+ QDict *resp, *args, *data, *ret;
+ g_autofree gchar *uri = g_strdup_printf("exec: cat > %s", (gchar *)opaque);
+ const gchar *status;
+
+ qts = machine_start(BASE_MACHINE
+ "-netdev user,id=hs0 "
+ "-netdev user,id=hs1 ",
+ 2);
+
+ check_one_card(qts, false, "standby0", MAC_STANDBY0);
+ check_one_card(qts, false, "primary0", MAC_PRIMARY0);
+
+ qtest_qmp_device_add(qts, "virtio-net", "standby0",
+ "{'bus': 'root0',"
+ "'failover': 'on',"
+ "'netdev': 'hs0',"
+ "'mac': '"MAC_STANDBY0"'}");
+
+ check_one_card(qts, true, "standby0", MAC_STANDBY0);
+ check_one_card(qts, false, "primary0", MAC_PRIMARY0);
+
+ start_virtio_net(qts, 1, 0, "standby0");
+
+ check_one_card(qts, true, "standby0", MAC_STANDBY0);
+ check_one_card(qts, false, "primary0", MAC_PRIMARY0);
+
+ qtest_qmp_device_add(qts, "virtio-net", "primary0",
+ "{'bus': 'root1',"
+ "'failover_pair_id': 'standby0',"
+ "'netdev': 'hs1',"
+ "'rombar': 0,"
+ "'romfile': '',"
+ "'mac': '"MAC_PRIMARY0"'}");
+
+ check_one_card(qts, true, "standby0", MAC_STANDBY0);
+ check_one_card(qts, true, "primary0", MAC_PRIMARY0);
+
+ args = qdict_from_jsonf_nofail("{}");
+ g_assert_nonnull(args);
+ qdict_put_str(args, "uri", uri);
+
+ resp = qtest_qmp(qts, "{ 'execute': 'migrate', 'arguments': %p}", args);
+ g_assert(qdict_haskey(resp, "return"));
+ qobject_unref(resp);
+
+ /* the event is sent whan QEMU asks the OS to unplug the card */
+ resp = qtest_qmp_eventwait_ref(qts, "UNPLUG_PRIMARY");
+ g_assert(qdict_haskey(resp, "data"));
+
+ data = qdict_get_qdict(resp, "data");
+ g_assert(qdict_haskey(data, "device-id"));
+ g_assert_cmpstr(qdict_get_str(data, "device-id"), ==, "primary0");
+
+ qobject_unref(resp);
+
+ resp = qtest_qmp(qts, "{ 'execute': 'migrate_cancel' }");
+ g_assert(qdict_haskey(resp, "return"));
+ qobject_unref(resp);
+
+ /* migration has been cancelled while the unplug was in progress */
+
+ /* while the card is not ejected, we must be in "cancelling" state */
+ ret = migrate_status(qts);
+
+ status = qdict_get_str(ret, "status");
+ g_assert_cmpstr(status, ==, "cancelling");
+ qobject_unref(ret);
+
+ /* OS unplugs the cards, QEMU can move from wait-unplug state */
+ qtest_outl(qts, ACPI_PCIHP_ADDR_ICH9 + PCI_EJ_BASE, 1);
+
+ while (true) {
+ ret = migrate_status(qts);
+
+ status = qdict_get_str(ret, "status");
+ if (strcmp(status, "cancelled") == 0) {
+ break;
+ }
+ g_assert_cmpstr(status, !=, "failed");
+ g_assert_cmpstr(status, !=, "active");
+ qobject_unref(ret);
+ }
+ qobject_unref(ret);
+
+ check_one_card(qts, true, "standby0", MAC_STANDBY0);
+ check_one_card(qts, true, "primary0", MAC_PRIMARY0);
+
+ machine_stop(qts);
+}
+
+static void test_migrate_abort_active(gconstpointer opaque)
+{
+ QTestState *qts;
+ QDict *resp, *args, *data, *ret;
+ g_autofree gchar *uri = g_strdup_printf("exec: cat > %s", (gchar *)opaque);
+ const gchar *status;
+
+ qts = machine_start(BASE_MACHINE
+ "-netdev user,id=hs0 "
+ "-netdev user,id=hs1 ",
+ 2);
+
+ check_one_card(qts, false, "standby0", MAC_STANDBY0);
+ check_one_card(qts, false, "primary0", MAC_PRIMARY0);
+
+ qtest_qmp_device_add(qts, "virtio-net", "standby0",
+ "{'bus': 'root0',"
+ "'failover': 'on',"
+ "'netdev': 'hs0',"
+ "'mac': '"MAC_STANDBY0"'}");
+
+ check_one_card(qts, true, "standby0", MAC_STANDBY0);
+ check_one_card(qts, false, "primary0", MAC_PRIMARY0);
+
+ start_virtio_net(qts, 1, 0, "standby0");
+
+ check_one_card(qts, true, "standby0", MAC_STANDBY0);
+ check_one_card(qts, false, "primary0", MAC_PRIMARY0);
+
+ qtest_qmp_device_add(qts, "virtio-net", "primary0",
+ "{'bus': 'root1',"
+ "'failover_pair_id': 'standby0',"
+ "'netdev': 'hs1',"
+ "'rombar': 0,"
+ "'romfile': '',"
+ "'mac': '"MAC_PRIMARY0"'}");
+
+ check_one_card(qts, true, "standby0", MAC_STANDBY0);
+ check_one_card(qts, true, "primary0", MAC_PRIMARY0);
+
+ args = qdict_from_jsonf_nofail("{}");
+ g_assert_nonnull(args);
+ qdict_put_str(args, "uri", uri);
+
+ resp = qtest_qmp(qts, "{ 'execute': 'migrate', 'arguments': %p}", args);
+ g_assert(qdict_haskey(resp, "return"));
+ qobject_unref(resp);
+
+ /* the event is sent whan QEMU asks the OS to unplug the card */
+ resp = qtest_qmp_eventwait_ref(qts, "UNPLUG_PRIMARY");
+ g_assert(qdict_haskey(resp, "data"));
+
+ data = qdict_get_qdict(resp, "data");
+ g_assert(qdict_haskey(data, "device-id"));
+ g_assert_cmpstr(qdict_get_str(data, "device-id"), ==, "primary0");
+
+ qobject_unref(resp);
+
+ /* OS unplugs the cards, QEMU can move from wait-unplug state */
+ qtest_outl(qts, ACPI_PCIHP_ADDR_ICH9 + PCI_EJ_BASE, 1);
+
+ while (true) {
+ ret = migrate_status(qts);
+
+ status = qdict_get_str(ret, "status");
+ if (strcmp(status, "wait-unplug") != 0) {
+ break;
+ }
+ g_assert_cmpstr(status, !=, "failed");
+ qobject_unref(ret);
+ }
+ qobject_unref(resp);
+
+ resp = qtest_qmp(qts, "{ 'execute': 'migrate_cancel' }");
+ g_assert(qdict_haskey(resp, "return"));
+ qobject_unref(resp);
+
+ while (true) {
+ ret = migrate_status(qts);
+
+ status = qdict_get_str(ret, "status");
+ if (strcmp(status, "cancelled") == 0) {
+ break;
+ }
+ g_assert_cmpstr(status, !=, "failed");
+ g_assert_cmpstr(status, !=, "active");
+ qobject_unref(ret);
+ }
+ qobject_unref(ret);
+
+ check_one_card(qts, true, "standby0", MAC_STANDBY0);
+ check_one_card(qts, true, "primary0", MAC_PRIMARY0);
+
+ machine_stop(qts);
+}
+
+static void test_migrate_abort_timeout(gconstpointer opaque)
+{
+ QTestState *qts;
+ QDict *resp, *args, *data, *ret;
+ g_autofree gchar *uri = g_strdup_printf("exec: cat > %s", (gchar *)opaque);
+ const gchar *status;
+ int total;
+
+ qts = machine_start(BASE_MACHINE
+ "-netdev user,id=hs0 "
+ "-netdev user,id=hs1 ",
+ 2);
+
+ check_one_card(qts, false, "standby0", MAC_STANDBY0);
+ check_one_card(qts, false, "primary0", MAC_PRIMARY0);
+
+ qtest_qmp_device_add(qts, "virtio-net", "standby0",
+ "{'bus': 'root0',"
+ "'failover': 'on',"
+ "'netdev': 'hs0',"
+ "'mac': '"MAC_STANDBY0"'}");
+
+ check_one_card(qts, true, "standby0", MAC_STANDBY0);
+ check_one_card(qts, false, "primary0", MAC_PRIMARY0);
+
+ start_virtio_net(qts, 1, 0, "standby0");
+
+ check_one_card(qts, true, "standby0", MAC_STANDBY0);
+ check_one_card(qts, false, "primary0", MAC_PRIMARY0);
+
+ qtest_qmp_device_add(qts, "virtio-net", "primary0",
+ "{'bus': 'root1',"
+ "'failover_pair_id': 'standby0',"
+ "'netdev': 'hs1',"
+ "'rombar': 0,"
+ "'romfile': '',"
+ "'mac': '"MAC_PRIMARY0"'}");
+
+ check_one_card(qts, true, "standby0", MAC_STANDBY0);
+ check_one_card(qts, true, "primary0", MAC_PRIMARY0);
+
+ args = qdict_from_jsonf_nofail("{}");
+ g_assert_nonnull(args);
+ qdict_put_str(args, "uri", uri);
+
+ resp = qtest_qmp(qts, "{ 'execute': 'migrate', 'arguments': %p}", args);
+ g_assert(qdict_haskey(resp, "return"));
+ qobject_unref(resp);
+
+ /* the event is sent whan QEMU asks the OS to unplug the card */
+ resp = qtest_qmp_eventwait_ref(qts, "UNPLUG_PRIMARY");
+ g_assert(qdict_haskey(resp, "data"));
+
+ data = qdict_get_qdict(resp, "data");
+ g_assert(qdict_haskey(data, "device-id"));
+ g_assert_cmpstr(qdict_get_str(data, "device-id"), ==, "primary0");
+
+ qobject_unref(resp);
+
+ resp = qtest_qmp(qts, "{ 'execute': 'migrate_cancel' }");
+ g_assert(qdict_haskey(resp, "return"));
+ qobject_unref(resp);
+
+ /* migration has been cancelled while the unplug was in progress */
+
+ /* while the card is not ejected, we must be in "cancelling" state */
+
+ total = 0;
+ while (true) {
+ ret = migrate_status(qts);
+
+ status = qdict_get_str(ret, "status");
+ if (strcmp(status, "cancelled") == 0) {
+ break;
+ }
+ g_assert_cmpstr(status, ==, "cancelling");
+ g_assert(qdict_haskey(ret, "total-time"));
+ total = qdict_get_int(ret, "total-time");
+ qobject_unref(ret);
+ }
+ qobject_unref(ret);
+
+ /*
+ * migration timeout in this case is 30 seconds
+ * check we exit on the timeout (ms)
+ */
+ g_assert_cmpint(total, >, 30000);
+
+ check_one_card(qts, true, "standby0", MAC_STANDBY0);
+ check_one_card(qts, true, "primary0", MAC_PRIMARY0);
+
+ machine_stop(qts);
+}
+
int main(int argc, char **argv)
{
gchar *tmpfile = g_strdup_printf("/tmp/failover_test_migrate-%u-%u",
@@ -714,6 +997,14 @@ int main(int argc, char **argv)
test_migrate_out);
qtest_add_data_func("failover-virtio-net/migrate/in", tmpfile,
test_migrate_in);
+ qtest_add_data_func("failover-virtio-net/migrate/abort/wait-unplug",
+ tmpfile, test_migrate_abort_wait_unplug);
+ qtest_add_data_func("failover-virtio-net/migrate/abort/active", tmpfile,
+ test_migrate_abort_active);
+ if (g_test_slow()) {
+ qtest_add_data_func("failover-virtio-net/migrate/abort/timeout",
+ tmpfile, test_migrate_abort_timeout);
+ }
ret = g_test_run();
--
2.33.1
On 06/12/2021 23.20, Laurent Vivier wrote:
> Add some tests to check the state of the machine if the migration
> is cancelled while we are using virtio-net failover.
>
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> ---
> tests/qtest/virtio-net-failover.c | 291 ++++++++++++++++++++++++++++++
> 1 file changed, 291 insertions(+)
>
> diff --git a/tests/qtest/virtio-net-failover.c b/tests/qtest/virtio-net-failover.c
> index c88f8ddec39a..57abb99e7f6e 100644
> --- a/tests/qtest/virtio-net-failover.c
> +++ b/tests/qtest/virtio-net-failover.c
> @@ -682,6 +682,289 @@ static void test_migrate_in(gconstpointer opaque)
> machine_stop(qts);
> }
>
> +static void test_migrate_abort_wait_unplug(gconstpointer opaque)
> +{
> + QTestState *qts;
> + QDict *resp, *args, *data, *ret;
> + g_autofree gchar *uri = g_strdup_printf("exec: cat > %s", (gchar *)opaque);
> + const gchar *status;
> +
> + qts = machine_start(BASE_MACHINE
> + "-netdev user,id=hs0 "
> + "-netdev user,id=hs1 ",
> + 2);
> +
> + check_one_card(qts, false, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + qtest_qmp_device_add(qts, "virtio-net", "standby0",
> + "{'bus': 'root0',"
> + "'failover': 'on',"
> + "'netdev': 'hs0',"
> + "'mac': '"MAC_STANDBY0"'}");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + start_virtio_net(qts, 1, 0, "standby0");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + qtest_qmp_device_add(qts, "virtio-net", "primary0",
> + "{'bus': 'root1',"
> + "'failover_pair_id': 'standby0',"
> + "'netdev': 'hs1',"
> + "'rombar': 0,"
> + "'romfile': '',"
> + "'mac': '"MAC_PRIMARY0"'}");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, true, "primary0", MAC_PRIMARY0);
> +
> + args = qdict_from_jsonf_nofail("{}");
> + g_assert_nonnull(args);
> + qdict_put_str(args, "uri", uri);
> +
> + resp = qtest_qmp(qts, "{ 'execute': 'migrate', 'arguments': %p}", args);
> + g_assert(qdict_haskey(resp, "return"));
> + qobject_unref(resp);
> +
> + /* the event is sent whan QEMU asks the OS to unplug the card */
> + resp = qtest_qmp_eventwait_ref(qts, "UNPLUG_PRIMARY");
> + g_assert(qdict_haskey(resp, "data"));
> +
> + data = qdict_get_qdict(resp, "data");
> + g_assert(qdict_haskey(data, "device-id"));
> + g_assert_cmpstr(qdict_get_str(data, "device-id"), ==, "primary0");
> +
> + qobject_unref(resp);
> +
> + resp = qtest_qmp(qts, "{ 'execute': 'migrate_cancel' }");
> + g_assert(qdict_haskey(resp, "return"));
> + qobject_unref(resp);
> +
> + /* migration has been cancelled while the unplug was in progress */
> +
> + /* while the card is not ejected, we must be in "cancelling" state */
> + ret = migrate_status(qts);
> +
> + status = qdict_get_str(ret, "status");
> + g_assert_cmpstr(status, ==, "cancelling");
> + qobject_unref(ret);
> +
> + /* OS unplugs the cards, QEMU can move from wait-unplug state */
> + qtest_outl(qts, ACPI_PCIHP_ADDR_ICH9 + PCI_EJ_BASE, 1);
> +
> + while (true) {
> + ret = migrate_status(qts);
> +
> + status = qdict_get_str(ret, "status");
> + if (strcmp(status, "cancelled") == 0) {
> + break;
> + }
> + g_assert_cmpstr(status, !=, "failed");
> + g_assert_cmpstr(status, !=, "active");
> + qobject_unref(ret);
> + }
> + qobject_unref(ret);
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, true, "primary0", MAC_PRIMARY0);
> +
> + machine_stop(qts);
> +}
> +
> +static void test_migrate_abort_active(gconstpointer opaque)
> +{
> + QTestState *qts;
> + QDict *resp, *args, *data, *ret;
> + g_autofree gchar *uri = g_strdup_printf("exec: cat > %s", (gchar *)opaque);
> + const gchar *status;
> +
> + qts = machine_start(BASE_MACHINE
> + "-netdev user,id=hs0 "
> + "-netdev user,id=hs1 ",
> + 2);
> +
> + check_one_card(qts, false, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + qtest_qmp_device_add(qts, "virtio-net", "standby0",
> + "{'bus': 'root0',"
> + "'failover': 'on',"
> + "'netdev': 'hs0',"
> + "'mac': '"MAC_STANDBY0"'}");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + start_virtio_net(qts, 1, 0, "standby0");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + qtest_qmp_device_add(qts, "virtio-net", "primary0",
> + "{'bus': 'root1',"
> + "'failover_pair_id': 'standby0',"
> + "'netdev': 'hs1',"
> + "'rombar': 0,"
> + "'romfile': '',"
> + "'mac': '"MAC_PRIMARY0"'}");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, true, "primary0", MAC_PRIMARY0);
> +
> + args = qdict_from_jsonf_nofail("{}");
> + g_assert_nonnull(args);
> + qdict_put_str(args, "uri", uri);
> +
> + resp = qtest_qmp(qts, "{ 'execute': 'migrate', 'arguments': %p}", args);
> + g_assert(qdict_haskey(resp, "return"));
> + qobject_unref(resp);
> +
> + /* the event is sent whan QEMU asks the OS to unplug the card */
> + resp = qtest_qmp_eventwait_ref(qts, "UNPLUG_PRIMARY");
> + g_assert(qdict_haskey(resp, "data"));
> +
> + data = qdict_get_qdict(resp, "data");
> + g_assert(qdict_haskey(data, "device-id"));
> + g_assert_cmpstr(qdict_get_str(data, "device-id"), ==, "primary0");
> +
> + qobject_unref(resp);
> +
> + /* OS unplugs the cards, QEMU can move from wait-unplug state */
> + qtest_outl(qts, ACPI_PCIHP_ADDR_ICH9 + PCI_EJ_BASE, 1);
> +
> + while (true) {
> + ret = migrate_status(qts);
> +
> + status = qdict_get_str(ret, "status");
> + if (strcmp(status, "wait-unplug") != 0) {
> + break;
> + }
> + g_assert_cmpstr(status, !=, "failed");
> + qobject_unref(ret);
> + }
> + qobject_unref(resp);
> +
> + resp = qtest_qmp(qts, "{ 'execute': 'migrate_cancel' }");
> + g_assert(qdict_haskey(resp, "return"));
> + qobject_unref(resp);
> +
> + while (true) {
> + ret = migrate_status(qts);
> +
> + status = qdict_get_str(ret, "status");
> + if (strcmp(status, "cancelled") == 0) {
> + break;
> + }
> + g_assert_cmpstr(status, !=, "failed");
> + g_assert_cmpstr(status, !=, "active");
> + qobject_unref(ret);
> + }
> + qobject_unref(ret);
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, true, "primary0", MAC_PRIMARY0);
> +
> + machine_stop(qts);
> +}
> +
> +static void test_migrate_abort_timeout(gconstpointer opaque)
> +{
> + QTestState *qts;
> + QDict *resp, *args, *data, *ret;
> + g_autofree gchar *uri = g_strdup_printf("exec: cat > %s", (gchar *)opaque);
> + const gchar *status;
> + int total;
> +
> + qts = machine_start(BASE_MACHINE
> + "-netdev user,id=hs0 "
> + "-netdev user,id=hs1 ",
> + 2);
> +
> + check_one_card(qts, false, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + qtest_qmp_device_add(qts, "virtio-net", "standby0",
> + "{'bus': 'root0',"
> + "'failover': 'on',"
> + "'netdev': 'hs0',"
> + "'mac': '"MAC_STANDBY0"'}");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + start_virtio_net(qts, 1, 0, "standby0");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + qtest_qmp_device_add(qts, "virtio-net", "primary0",
> + "{'bus': 'root1',"
> + "'failover_pair_id': 'standby0',"
> + "'netdev': 'hs1',"
> + "'rombar': 0,"
> + "'romfile': '',"
> + "'mac': '"MAC_PRIMARY0"'}");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, true, "primary0", MAC_PRIMARY0);
> +
> + args = qdict_from_jsonf_nofail("{}");
> + g_assert_nonnull(args);
> + qdict_put_str(args, "uri", uri);
> +
> + resp = qtest_qmp(qts, "{ 'execute': 'migrate', 'arguments': %p}", args);
> + g_assert(qdict_haskey(resp, "return"));
> + qobject_unref(resp);
> +
> + /* the event is sent whan QEMU asks the OS to unplug the card */
> + resp = qtest_qmp_eventwait_ref(qts, "UNPLUG_PRIMARY");
> + g_assert(qdict_haskey(resp, "data"));
> +
> + data = qdict_get_qdict(resp, "data");
> + g_assert(qdict_haskey(data, "device-id"));
> + g_assert_cmpstr(qdict_get_str(data, "device-id"), ==, "primary0");
> +
> + qobject_unref(resp);
> +
> + resp = qtest_qmp(qts, "{ 'execute': 'migrate_cancel' }");
> + g_assert(qdict_haskey(resp, "return"));
> + qobject_unref(resp);
> +
> + /* migration has been cancelled while the unplug was in progress */
> +
> + /* while the card is not ejected, we must be in "cancelling" state */
> +
> + total = 0;
> + while (true) {
> + ret = migrate_status(qts);
> +
> + status = qdict_get_str(ret, "status");
> + if (strcmp(status, "cancelled") == 0) {
> + break;
> + }
> + g_assert_cmpstr(status, ==, "cancelling");
> + g_assert(qdict_haskey(ret, "total-time"));
> + total = qdict_get_int(ret, "total-time");
> + qobject_unref(ret);
> + }
> + qobject_unref(ret);
> +
> + /*
> + * migration timeout in this case is 30 seconds
> + * check we exit on the timeout (ms)
> + */
> + g_assert_cmpint(total, >, 30000);
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, true, "primary0", MAC_PRIMARY0);
> +
> + machine_stop(qts);
> +}
> +
> int main(int argc, char **argv)
> {
> gchar *tmpfile = g_strdup_printf("/tmp/failover_test_migrate-%u-%u",
> @@ -714,6 +997,14 @@ int main(int argc, char **argv)
> test_migrate_out);
> qtest_add_data_func("failover-virtio-net/migrate/in", tmpfile,
> test_migrate_in);
> + qtest_add_data_func("failover-virtio-net/migrate/abort/wait-unplug",
> + tmpfile, test_migrate_abort_wait_unplug);
> + qtest_add_data_func("failover-virtio-net/migrate/abort/active", tmpfile,
> + test_migrate_abort_active);
> + if (g_test_slow()) {
> + qtest_add_data_func("failover-virtio-net/migrate/abort/timeout",
> + tmpfile, test_migrate_abort_timeout);
> + }
>
> ret = g_test_run();
Acked-by: Thomas Huth <thuth@redhat.com>
On Mon, Dec 06, 2021 at 11:20:39PM +0100, Laurent Vivier wrote:
> Add some tests to check the state of the machine if the migration
> is cancelled while we are using virtio-net failover.
>
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
So this one I think is needed for the release. Thomas, are you
merging it there or should I?
> ---
> tests/qtest/virtio-net-failover.c | 291 ++++++++++++++++++++++++++++++
> 1 file changed, 291 insertions(+)
>
> diff --git a/tests/qtest/virtio-net-failover.c b/tests/qtest/virtio-net-failover.c
> index c88f8ddec39a..57abb99e7f6e 100644
> --- a/tests/qtest/virtio-net-failover.c
> +++ b/tests/qtest/virtio-net-failover.c
> @@ -682,6 +682,289 @@ static void test_migrate_in(gconstpointer opaque)
> machine_stop(qts);
> }
>
> +static void test_migrate_abort_wait_unplug(gconstpointer opaque)
> +{
> + QTestState *qts;
> + QDict *resp, *args, *data, *ret;
> + g_autofree gchar *uri = g_strdup_printf("exec: cat > %s", (gchar *)opaque);
> + const gchar *status;
> +
> + qts = machine_start(BASE_MACHINE
> + "-netdev user,id=hs0 "
> + "-netdev user,id=hs1 ",
> + 2);
> +
> + check_one_card(qts, false, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + qtest_qmp_device_add(qts, "virtio-net", "standby0",
> + "{'bus': 'root0',"
> + "'failover': 'on',"
> + "'netdev': 'hs0',"
> + "'mac': '"MAC_STANDBY0"'}");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + start_virtio_net(qts, 1, 0, "standby0");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + qtest_qmp_device_add(qts, "virtio-net", "primary0",
> + "{'bus': 'root1',"
> + "'failover_pair_id': 'standby0',"
> + "'netdev': 'hs1',"
> + "'rombar': 0,"
> + "'romfile': '',"
> + "'mac': '"MAC_PRIMARY0"'}");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, true, "primary0", MAC_PRIMARY0);
> +
> + args = qdict_from_jsonf_nofail("{}");
> + g_assert_nonnull(args);
> + qdict_put_str(args, "uri", uri);
> +
> + resp = qtest_qmp(qts, "{ 'execute': 'migrate', 'arguments': %p}", args);
> + g_assert(qdict_haskey(resp, "return"));
> + qobject_unref(resp);
> +
> + /* the event is sent whan QEMU asks the OS to unplug the card */
> + resp = qtest_qmp_eventwait_ref(qts, "UNPLUG_PRIMARY");
> + g_assert(qdict_haskey(resp, "data"));
> +
> + data = qdict_get_qdict(resp, "data");
> + g_assert(qdict_haskey(data, "device-id"));
> + g_assert_cmpstr(qdict_get_str(data, "device-id"), ==, "primary0");
> +
> + qobject_unref(resp);
> +
> + resp = qtest_qmp(qts, "{ 'execute': 'migrate_cancel' }");
> + g_assert(qdict_haskey(resp, "return"));
> + qobject_unref(resp);
> +
> + /* migration has been cancelled while the unplug was in progress */
> +
> + /* while the card is not ejected, we must be in "cancelling" state */
> + ret = migrate_status(qts);
> +
> + status = qdict_get_str(ret, "status");
> + g_assert_cmpstr(status, ==, "cancelling");
> + qobject_unref(ret);
> +
> + /* OS unplugs the cards, QEMU can move from wait-unplug state */
> + qtest_outl(qts, ACPI_PCIHP_ADDR_ICH9 + PCI_EJ_BASE, 1);
> +
> + while (true) {
> + ret = migrate_status(qts);
> +
> + status = qdict_get_str(ret, "status");
> + if (strcmp(status, "cancelled") == 0) {
> + break;
> + }
> + g_assert_cmpstr(status, !=, "failed");
> + g_assert_cmpstr(status, !=, "active");
> + qobject_unref(ret);
> + }
> + qobject_unref(ret);
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, true, "primary0", MAC_PRIMARY0);
> +
> + machine_stop(qts);
> +}
> +
> +static void test_migrate_abort_active(gconstpointer opaque)
> +{
> + QTestState *qts;
> + QDict *resp, *args, *data, *ret;
> + g_autofree gchar *uri = g_strdup_printf("exec: cat > %s", (gchar *)opaque);
> + const gchar *status;
> +
> + qts = machine_start(BASE_MACHINE
> + "-netdev user,id=hs0 "
> + "-netdev user,id=hs1 ",
> + 2);
> +
> + check_one_card(qts, false, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + qtest_qmp_device_add(qts, "virtio-net", "standby0",
> + "{'bus': 'root0',"
> + "'failover': 'on',"
> + "'netdev': 'hs0',"
> + "'mac': '"MAC_STANDBY0"'}");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + start_virtio_net(qts, 1, 0, "standby0");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + qtest_qmp_device_add(qts, "virtio-net", "primary0",
> + "{'bus': 'root1',"
> + "'failover_pair_id': 'standby0',"
> + "'netdev': 'hs1',"
> + "'rombar': 0,"
> + "'romfile': '',"
> + "'mac': '"MAC_PRIMARY0"'}");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, true, "primary0", MAC_PRIMARY0);
> +
> + args = qdict_from_jsonf_nofail("{}");
> + g_assert_nonnull(args);
> + qdict_put_str(args, "uri", uri);
> +
> + resp = qtest_qmp(qts, "{ 'execute': 'migrate', 'arguments': %p}", args);
> + g_assert(qdict_haskey(resp, "return"));
> + qobject_unref(resp);
> +
> + /* the event is sent whan QEMU asks the OS to unplug the card */
> + resp = qtest_qmp_eventwait_ref(qts, "UNPLUG_PRIMARY");
> + g_assert(qdict_haskey(resp, "data"));
> +
> + data = qdict_get_qdict(resp, "data");
> + g_assert(qdict_haskey(data, "device-id"));
> + g_assert_cmpstr(qdict_get_str(data, "device-id"), ==, "primary0");
> +
> + qobject_unref(resp);
> +
> + /* OS unplugs the cards, QEMU can move from wait-unplug state */
> + qtest_outl(qts, ACPI_PCIHP_ADDR_ICH9 + PCI_EJ_BASE, 1);
> +
> + while (true) {
> + ret = migrate_status(qts);
> +
> + status = qdict_get_str(ret, "status");
> + if (strcmp(status, "wait-unplug") != 0) {
> + break;
> + }
> + g_assert_cmpstr(status, !=, "failed");
> + qobject_unref(ret);
> + }
> + qobject_unref(resp);
> +
> + resp = qtest_qmp(qts, "{ 'execute': 'migrate_cancel' }");
> + g_assert(qdict_haskey(resp, "return"));
> + qobject_unref(resp);
> +
> + while (true) {
> + ret = migrate_status(qts);
> +
> + status = qdict_get_str(ret, "status");
> + if (strcmp(status, "cancelled") == 0) {
> + break;
> + }
> + g_assert_cmpstr(status, !=, "failed");
> + g_assert_cmpstr(status, !=, "active");
> + qobject_unref(ret);
> + }
> + qobject_unref(ret);
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, true, "primary0", MAC_PRIMARY0);
> +
> + machine_stop(qts);
> +}
> +
> +static void test_migrate_abort_timeout(gconstpointer opaque)
> +{
> + QTestState *qts;
> + QDict *resp, *args, *data, *ret;
> + g_autofree gchar *uri = g_strdup_printf("exec: cat > %s", (gchar *)opaque);
> + const gchar *status;
> + int total;
> +
> + qts = machine_start(BASE_MACHINE
> + "-netdev user,id=hs0 "
> + "-netdev user,id=hs1 ",
> + 2);
> +
> + check_one_card(qts, false, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + qtest_qmp_device_add(qts, "virtio-net", "standby0",
> + "{'bus': 'root0',"
> + "'failover': 'on',"
> + "'netdev': 'hs0',"
> + "'mac': '"MAC_STANDBY0"'}");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + start_virtio_net(qts, 1, 0, "standby0");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + qtest_qmp_device_add(qts, "virtio-net", "primary0",
> + "{'bus': 'root1',"
> + "'failover_pair_id': 'standby0',"
> + "'netdev': 'hs1',"
> + "'rombar': 0,"
> + "'romfile': '',"
> + "'mac': '"MAC_PRIMARY0"'}");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, true, "primary0", MAC_PRIMARY0);
> +
> + args = qdict_from_jsonf_nofail("{}");
> + g_assert_nonnull(args);
> + qdict_put_str(args, "uri", uri);
> +
> + resp = qtest_qmp(qts, "{ 'execute': 'migrate', 'arguments': %p}", args);
> + g_assert(qdict_haskey(resp, "return"));
> + qobject_unref(resp);
> +
> + /* the event is sent whan QEMU asks the OS to unplug the card */
> + resp = qtest_qmp_eventwait_ref(qts, "UNPLUG_PRIMARY");
> + g_assert(qdict_haskey(resp, "data"));
> +
> + data = qdict_get_qdict(resp, "data");
> + g_assert(qdict_haskey(data, "device-id"));
> + g_assert_cmpstr(qdict_get_str(data, "device-id"), ==, "primary0");
> +
> + qobject_unref(resp);
> +
> + resp = qtest_qmp(qts, "{ 'execute': 'migrate_cancel' }");
> + g_assert(qdict_haskey(resp, "return"));
> + qobject_unref(resp);
> +
> + /* migration has been cancelled while the unplug was in progress */
> +
> + /* while the card is not ejected, we must be in "cancelling" state */
> +
> + total = 0;
> + while (true) {
> + ret = migrate_status(qts);
> +
> + status = qdict_get_str(ret, "status");
> + if (strcmp(status, "cancelled") == 0) {
> + break;
> + }
> + g_assert_cmpstr(status, ==, "cancelling");
> + g_assert(qdict_haskey(ret, "total-time"));
> + total = qdict_get_int(ret, "total-time");
> + qobject_unref(ret);
> + }
> + qobject_unref(ret);
> +
> + /*
> + * migration timeout in this case is 30 seconds
> + * check we exit on the timeout (ms)
> + */
> + g_assert_cmpint(total, >, 30000);
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, true, "primary0", MAC_PRIMARY0);
> +
> + machine_stop(qts);
> +}
> +
> int main(int argc, char **argv)
> {
> gchar *tmpfile = g_strdup_printf("/tmp/failover_test_migrate-%u-%u",
> @@ -714,6 +997,14 @@ int main(int argc, char **argv)
> test_migrate_out);
> qtest_add_data_func("failover-virtio-net/migrate/in", tmpfile,
> test_migrate_in);
> + qtest_add_data_func("failover-virtio-net/migrate/abort/wait-unplug",
> + tmpfile, test_migrate_abort_wait_unplug);
> + qtest_add_data_func("failover-virtio-net/migrate/abort/active", tmpfile,
> + test_migrate_abort_active);
> + if (g_test_slow()) {
> + qtest_add_data_func("failover-virtio-net/migrate/abort/timeout",
> + tmpfile, test_migrate_abort_timeout);
> + }
>
> ret = g_test_run();
>
> --
> 2.33.1
>
>
>
On 08/12/2021 08.44, Michael S. Tsirkin wrote: > On Mon, Dec 06, 2021 at 11:20:39PM +0100, Laurent Vivier wrote: >> Add some tests to check the state of the machine if the migration >> is cancelled while we are using virtio-net failover. >> >> Signed-off-by: Laurent Vivier <lvivier@redhat.com> > > So this one I think is needed for the release. Thomas, are you > merging it there or should I? rc4 has already been tagged yesterday. I don't think that Richard will still allow another PR at this point in time unless it fixes a really really critical problem. Laurent's series only adds a new qtest, so this certainly does not qualify, AFAIK. Thomas
On 08/12/2021 08.48, Thomas Huth wrote: > On 08/12/2021 08.44, Michael S. Tsirkin wrote: >> On Mon, Dec 06, 2021 at 11:20:39PM +0100, Laurent Vivier wrote: >>> Add some tests to check the state of the machine if the migration >>> is cancelled while we are using virtio-net failover. >>> >>> Signed-off-by: Laurent Vivier <lvivier@redhat.com> >> >> So this one I think is needed for the release. Thomas, are you >> merging it there or should I? > > rc4 has already been tagged yesterday. I don't think that Richard will still > allow another PR at this point in time unless it fixes a really really > critical problem. Laurent's series only adds a new qtest, so this certainly > does not qualify, AFAIK. Never mind, I had patch series v7 before my eyes when I hit the reply button here. The patch that touches the code outside of the test folder (3/6) has already been merged, so we should be fine for the release. Thomas
© 2016 - 2026 Red Hat, Inc.