From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Laurent Vivier" <lvivier@redhat.com>,
"Peter Xu" <peterx@redhat.com>,
"Juan Quintela" <quintela@redhat.com>,
"Leonardo Bras" <leobras@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>
Subject: [PATCH v3 8/9] tests/qtest: make more migration pre-copy scenarios run non-live
Date: Wed, 31 May 2023 14:23:59 +0100 [thread overview]
Message-ID: <20230531132400.1129576-9-berrange@redhat.com> (raw)
In-Reply-To: <20230531132400.1129576-1-berrange@redhat.com>
There are 27 pre-copy live migration scenarios being tested. In all of
these we force non-convergance and run for one iteration, then let it
converge and wait for completion during the second (or following)
iterations. At 3 mbps bandwidth limit the first iteration takes a very
long time (~30 seconds).
While it is important to test the migration passes and convergance
logic, it is overkill to do this for all 27 pre-copy scenarios. The
TLS migration scenarios in particular are merely exercising different
code paths during connection establishment.
To optimize time taken, switch most of the test scenarios to run
non-live (ie guest CPUs paused) with no bandwidth limits. This gives
a massive speed up for most of the test scenarios.
For test coverage the following scenarios are unchanged
* Precopy with UNIX sockets
* Precopy with UNIX sockets and dirty ring tracking
* Precopy with XBZRLE
* Precopy with UNIX compress
* Precopy with UNIX compress (nowait)
* Precopy with multifd
On a test machine this reduces execution time from 13 minutes to
8 minutes.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
tests/qtest/migration-test.c | 81 +++++++++++++++++++++++++++++-------
1 file changed, 66 insertions(+), 15 deletions(-)
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index aee25e1c4f..e033d9f0c1 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -577,9 +577,12 @@ typedef struct {
MIG_TEST_FAIL_DEST_QUIT_ERR,
} result;
- /* Optional: set number of migration passes to wait for */
+ /* Optional: set number of migration passes to wait for, if live==true */
unsigned int iterations;
+ /* Optional: whether the guest CPUs should be running during migration */
+ bool live;
+
/* Postcopy specific fields */
void *postcopy_data;
bool postcopy_preempt;
@@ -1385,8 +1388,6 @@ static void test_precopy_common(MigrateCommon *args)
return;
}
- migrate_ensure_non_converge(from);
-
if (args->start_hook) {
data_hook = args->start_hook(from, to);
}
@@ -1396,6 +1397,31 @@ static void test_precopy_common(MigrateCommon *args)
wait_for_serial("src_serial");
}
+ if (args->live) {
+ /*
+ * Testing live migration, we want to ensure that some
+ * memory is re-dirtied after being transferred, so that
+ * we exercise logic for dirty page handling. We achieve
+ * this with a ridiculosly low bandwidth that guarantees
+ * non-convergance.
+ */
+ migrate_ensure_non_converge(from);
+ } else {
+ /*
+ * Testing non-live migration, we allow it to run at
+ * full speed to ensure short test case duration.
+ * For tests expected to fail, we don't need to
+ * change anything.
+ */
+ if (args->result == MIG_TEST_SUCCEED) {
+ qtest_qmp_assert_success(from, "{ 'execute' : 'stop'}");
+ if (!got_stop) {
+ qtest_qmp_eventwait(from, "STOP");
+ }
+ migrate_ensure_converge(from);
+ }
+ }
+
if (!args->connect_uri) {
g_autofree char *local_connect_uri =
migrate_get_socket_address(to, "socket-address");
@@ -1413,25 +1439,41 @@ static void test_precopy_common(MigrateCommon *args)
qtest_set_expected_status(to, EXIT_FAILURE);
}
} else {
- if (args->iterations) {
- while (args->iterations--) {
+ if (args->live) {
+ if (args->iterations) {
+ while (args->iterations--) {
+ wait_for_migration_pass(from);
+ }
+ } else {
wait_for_migration_pass(from);
}
- } else {
- wait_for_migration_pass(from);
- }
- migrate_ensure_converge(from);
+ migrate_ensure_converge(from);
- /* We do this first, as it has a timeout to stop us
- * hanging forever if migration didn't converge */
- wait_for_migration_complete(from);
+ /*
+ * We do this first, as it has a timeout to stop us
+ * hanging forever if migration didn't converge
+ */
+ wait_for_migration_complete(from);
- if (!got_stop) {
- qtest_qmp_eventwait(from, "STOP");
+ if (!got_stop) {
+ qtest_qmp_eventwait(from, "STOP");
+ }
+ } else {
+ wait_for_migration_complete(from);
+ /*
+ * Must wait for dst to finish reading all incoming
+ * data on the socket before issuing 'cont' otherwise
+ * it'll be ignored
+ */
+ wait_for_migration_complete(to);
+
+ qtest_qmp_assert_success(to, "{ 'execute' : 'cont'}");
}
- qtest_qmp_eventwait(to, "RESUME");
+ if (!got_resume) {
+ qtest_qmp_eventwait(to, "RESUME");
+ }
wait_for_serial("dest_serial");
}
@@ -1449,6 +1491,8 @@ static void test_precopy_unix_plain(void)
MigrateCommon args = {
.listen_uri = uri,
.connect_uri = uri,
+
+ .live = true,
};
test_precopy_common(&args);
@@ -1464,6 +1508,8 @@ static void test_precopy_unix_dirty_ring(void)
},
.listen_uri = uri,
.connect_uri = uri,
+
+ .live = true,
};
test_precopy_common(&args);
@@ -1575,6 +1621,7 @@ static void test_precopy_unix_xbzrle(void)
.start_hook = test_migrate_xbzrle_start,
.iterations = 2,
+ .live = true,
};
test_precopy_common(&args);
@@ -1592,6 +1639,7 @@ static void test_precopy_unix_compress(void)
* the previous iteration.
*/
.iterations = 2,
+ .live = true,
};
test_precopy_common(&args);
@@ -1609,6 +1657,7 @@ static void test_precopy_unix_compress_nowait(void)
* the previous iteration.
*/
.iterations = 2,
+ .live = true,
};
test_precopy_common(&args);
@@ -2017,6 +2066,8 @@ static void test_multifd_tcp_none(void)
MigrateCommon args = {
.listen_uri = "defer",
.start_hook = test_migrate_precopy_tcp_multifd_start,
+
+ .live = true,
};
test_precopy_common(&args);
}
--
2.40.1
next prev parent reply other threads:[~2023-05-31 13:24 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-31 13:23 [PATCH v3 0/9] tests/qtest: make migration-test massively faster Daniel P. Berrangé
2023-05-31 13:23 ` [PATCH v3 1/9] tests/qtest: add various qtest_qmp_assert_success() variants Daniel P. Berrangé
2023-06-01 9:23 ` Thomas Huth
2023-06-01 12:48 ` Daniel P. Berrangé
2023-06-01 12:04 ` Juan Quintela
2023-06-01 12:20 ` Juan Quintela
2023-06-01 12:51 ` Daniel P. Berrangé
2023-05-31 13:23 ` [PATCH v3 2/9] tests/qtest: add support for callback to receive QMP events Daniel P. Berrangé
2023-05-31 14:57 ` Thomas Huth
2023-06-01 12:14 ` Juan Quintela
2023-06-01 12:56 ` Daniel P. Berrangé
2023-05-31 13:23 ` [PATCH v3 3/9] tests/qtest: get rid of 'qmp_command' helper in migration test Daniel P. Berrangé
2023-06-01 9:26 ` Thomas Huth
2023-06-01 9:32 ` Daniel P. Berrangé
2023-06-01 12:17 ` Juan Quintela
2023-05-31 13:23 ` [PATCH v3 4/9] tests/qtest: get rid of some 'qtest_qmp' usage " Daniel P. Berrangé
2023-06-01 9:28 ` Thomas Huth
2023-06-01 12:10 ` Juan Quintela
2023-05-31 13:23 ` [PATCH v3 5/9] tests/qtest: switch to using event callbacks for STOP event Daniel P. Berrangé
2023-06-01 9:31 ` Thomas Huth
2023-06-01 12:23 ` Juan Quintela
2023-05-31 13:23 ` [PATCH v3 6/9] tests/qtest: replace wait_command() with qtest_qmp_assert_success Daniel P. Berrangé
2023-06-01 9:37 ` Thomas Huth
2023-06-01 12:27 ` Juan Quintela
2023-05-31 13:23 ` [PATCH v3 7/9] tests/qtest: capture RESUME events during migration Daniel P. Berrangé
2023-06-01 9:38 ` Thomas Huth
2023-06-01 12:31 ` Juan Quintela
2023-06-01 12:34 ` Daniel P. Berrangé
2023-06-01 12:37 ` Juan Quintela
2023-06-01 12:44 ` Daniel P. Berrangé
2023-05-31 13:23 ` Daniel P. Berrangé [this message]
2023-06-01 9:47 ` [PATCH v3 8/9] tests/qtest: make more migration pre-copy scenarios run non-live Thomas Huth
2023-06-01 12:33 ` Juan Quintela
2023-06-01 12:38 ` Daniel P. Berrangé
2023-06-01 16:09 ` Thomas Huth
2023-06-01 16:17 ` Daniel P. Berrangé
2023-06-01 16:26 ` Peter Xu
2023-06-01 15:30 ` Peter Xu
2023-06-01 15:39 ` Daniel P. Berrangé
2023-06-01 15:53 ` Peter Xu
2023-06-01 15:55 ` Daniel P. Berrangé
2023-06-01 16:17 ` Peter Xu
2023-06-01 16:35 ` Daniel P. Berrangé
2023-06-01 16:59 ` Peter Xu
2023-06-01 22:58 ` Juan Quintela
2023-06-01 22:55 ` Juan Quintela
2023-05-31 13:24 ` [PATCH v3 9/9] tests/qtest: massively speed up migration-test Daniel P. Berrangé
2023-06-01 10:04 ` Thomas Huth
2023-06-01 15:46 ` Peter Xu
2023-06-01 16:05 ` Daniel P. Berrangé
2023-06-01 16:22 ` Peter Xu
2023-06-01 16:36 ` Daniel P. Berrangé
2023-06-01 17:04 ` Peter Xu
2023-06-01 23:00 ` Juan Quintela
2023-06-01 23:43 ` Peter Xu
2023-07-10 9:35 ` Daniel P. Berrangé
2023-07-10 9:40 ` Thomas Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230531132400.1129576-9-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=leobras@redhat.com \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).