Add a migration test for cpr-transfer mode. Defer the connection to the
target monitor, else the test hangs because in cpr-transfer mode QEMU does
not listen for monitor connections until we send the migrate command to
source QEMU.
To test -incoming defer, send a migrate incoming command to the target,
after sending the migrate command to the source, as required by
cpr-transfer mode.
Signed-off-by: Steve Sistare <steven.sist...@oracle.com>
---
tests/qtest/migration-test.c | 59 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 59 insertions(+)
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index dfeb8d2..e364e9b 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -1769,6 +1769,9 @@ static void test_precopy_common(MigrateCommon *args)
if (args->start.defer_target_connect) {
qtest_connect_deferred(to);
qtest_qmp_handshake(to);
+ if (!strcmp(args->listen_uri, "defer")) {
+ migrate_incoming_qmp(to, args->connect_uri, "{}");
+ }
}
if (args->result != MIG_TEST_SUCCEED) {
@@ -2413,6 +2416,58 @@ static void test_multifd_file_mapped_ram_fdset_dio(void)
}
#endif /* !_WIN32 */
+static char *get_cpr_uri(void)
+{
+ return g_strdup_printf("unix:%s/cpr.sock", tmpfs);
+}
+
+static void *test_mode_transfer_start(QTestState *from, QTestState *to)
+{
+ g_autofree char *cpr_uri = get_cpr_uri();
+
+ migrate_set_parameter_str(from, "mode", "cpr-transfer");
+ migrate_set_parameter_str(from, "cpr-uri", cpr_uri);
+ return NULL;
+}
+
+/*
+ * cpr-transfer mode cannot use the target monitor prior to starting the
+ * migration, and cannot connect synchronously to the monitor, so defer
+ * the target connection.
+ */
+static void test_mode_transfer_common(bool incoming_defer)
+{
+ g_autofree char *cpr_uri = get_cpr_uri();
+ g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
+
+ const char *opts = "-machine anon-alloc=memfd -nodefaults";
+ g_autofree char *opts_target = g_strdup_printf("-cpr-uri %s %s",
+ cpr_uri, opts);
+
+ MigrateCommon args = {
+ .start.opts_source = opts,
+ .start.opts_target = opts_target,
+ .start.defer_target_connect = true,
+ .start.memory_backend = "-object
memory-backend-memfd,id=pc.ram,size=%s"
+ " -machine memory-backend=pc.ram",
+ .listen_uri = incoming_defer ? "defer" : uri,
+ .connect_uri = uri,
+ .start_hook = test_mode_transfer_start,
+ };
+
+ test_precopy_common(&args);
+}
+
+static void test_mode_transfer(void)
+{
+ test_mode_transfer_common(NULL);
+}
+
+static void test_mode_transfer_defer(void)
+{
+ test_mode_transfer_common(true);
+}
+
static void test_precopy_tcp_plain(void)
{
MigrateCommon args = {
@@ -3866,6 +3921,10 @@ int main(int argc, char **argv)
migration_test_add("/migration/mode/reboot", test_mode_reboot);
}
+ migration_test_add("/migration/mode/transfer", test_mode_transfer);
+ migration_test_add("/migration/mode/transfer/defer",
+ test_mode_transfer_defer);
+
migration_test_add("/migration/precopy/file/mapped-ram",
test_precopy_file_mapped_ram);
migration_test_add("/migration/precopy/file/mapped-ram/live",
--
1.8.3.1
