migration: Test the new "file:" migration
v4 cover migration: Test the new "file:" migration
Based-on:
[PATCH V4 0/2] migration file URI
https://lore.kernel.org/r/[email protected]
Since v3:
- used FILE_TEST_FILENAME for the three tests
v3:
https://lore.kernel.org/r/[email protected]
v2:
https://lore.kernel.org/r/[email protected]
v1:
https://lore.kernel.org/r/[email protected]
Here's the test for the file: migration.
I hit an issue with the setting of migration status. If we call query-migrate too soon after migrate-incoming, the query returns an empty response because we're not setting the MIGRATION_STATUS_SETUP in the incoming path. We just send the event, but never actually change state.
Aside from the fix, there's some tidying up to avoid duplicating too much code in the tests.
Thanks
CI run: https://gitlab.com/farosas/qemu/-/pipelines/912226554
Fabiano Rosas (6):
tests/qtest: migration: Expose migrate_set_capability tests/qtest: migration: Add migrate_incoming_qmp helper tests/qtest: migration: Use migrate_incoming_qmp where appropriate
migration: Set migration status early in incoming side tests/qtest: migration: Add support for negative testing of
qmp_migrate
tests/qtest: migration-test: Add tests for file-based migration
migration/migration.c | 7 +- tests/qtest/libqtest.c | 33 +++++++ tests/qtest/libqtest.h | 28 ++++++ tests/qtest/meson.build | 1 + tests/qtest/migration-helpers.c | 60 +++++++++++++ tests/qtest/migration-helpers.h | 10 +++ tests/qtest/migration-test.c | 138 +++++++++++++++++++++++++----- tests/qtest/virtio-net-failover.c | 77 ++--------------- 8 files changed, 261 insertions(+), 93 deletions(-)
Signature · 1 line
2.35.3
PATCH v4 1/6 tests/qtest: migration: Expose migrate_set_capability
The following patch will make use of this function from within migrate-helpers.c, so move it there.
--- tests/qtest/migration-helpers.c | 11 +++++++++++ tests/qtest/migration-helpers.h | 3 +++ tests/qtest/migration-test.c | 11 ----------- 3 files changed, 14 insertions(+), 11 deletions(-)
tests/qtest/migration-helpers.c +11 -0
@@ -70,6 +70,17 @@ void migrate_qmp(QTestState *who, const char *uri, const char *fmt, ...) "{ 'execute': 'migrate', 'arguments': %p}", args); } +void migrate_set_capability (QTestState *who,const char *capability, +bool value) +{ +qtest_qmp_assert_success (who, +"{ 'execute': 'migrate-set-capabilities'," +"'arguments': { " +"'capabilities': [ { " +"'capability': %s, 'state': %i } ] } }" , + capability, value); +} +/* * Note: caller is responsible to free the returned object via * qobject_unref() after use
tests/qtest/migration-helpers.h +3 -0
@@ -23,6 +23,9 @@ bool migrate_watch_for_resume(QTestState *who, const char *name, G_GNUC_PRINTF(3, 4)void migrate_qmp (QTestState *who,const char *uri,const char *fmt, ...); +void migrate_set_capability (QTestState *who,const char *capability, +bool value); +QDict *migrate_query (QTestState *who);QDict *migrate_query_not_failed (QTestState *who);
tests/qtest/migration-test.c +0 -11
@@ -472,17 +472,6 @@ static void migrate_cancel(QTestState *who)qtest_qmp_assert_success (who,"{ 'execute': 'migrate_cancel' }" ); } -static void migrate_set_capability (QTestState *who,const char *capability, -bool value) -{ -qtest_qmp_assert_success (who, -"{ 'execute': 'migrate-set-capabilities'," -"'arguments': { " -"'capabilities': [ { " -"'capability': %s, 'state': %i } ] } }" , - capability, value); -} -static void migrate_postcopy_start (QTestState *from,QTestState *to) {qtest_qmp_assert_success (from,"{ 'execute': 'migrate-start-postcopy' }" );
Signature · 1 line
2.35.3
PATCH v4 2/6 tests/qtest: migration: Add migrate_incoming_qmp helper
In reply to Fabiano Rosasfile-based migration requires the target to initiate its migration after the source has finished writing out the data in the file. Currently there's no easy way to initiate 'migrate-incoming', allow this by introducing migrate_incoming_qmp helper, similarly to migrate_qmp.
Also make sure migration events are enabled and wait for the incoming migration to start before returning. This avoid a race when querying the migration status too soon after issuing the command.
--- tests/qtest/migration-helpers.c | 29 +++++++++++++++++++++++++++++ tests/qtest/migration-helpers.h | 4 ++++ 2 files changed, 33 insertions(+)
tests/qtest/migration-helpers.c +29 -0
@@ -81,6 +81,35 @@ void migrate_set_capability(QTestState *who, const char *capability, capability, value); } +void migrate_incoming_qmp (QTestState *to,const char *uri,const char *fmt, ...) +{ +va_list ap; +QDict *args, *rsp, *data; + +va_start (ap, fmt); + args =qdict_from_vjsonf_nofail (fmt, ap); +va_end (ap); + +g_assert (!qdict_haskey (args,"uri" )); +qdict_put_str (args,"uri" , uri); + +migrate_set_capability (to,"events" , true); + + rsp =qtest_qmp (to,"{ 'execute': 'migrate-incoming', 'arguments': %p}" , + args); +g_assert (qdict_haskey (rsp,"return" )); +qobject_unref (rsp); + + rsp =qtest_qmp_eventwait_ref (to,"MIGRATION" ); +g_assert (qdict_haskey (rsp,"data" )); + + data =qdict_get_qdict (rsp,"data" ); +g_assert (qdict_haskey (data,"status" )); + g_assert_cmpstr(qdict_get_str(data, "status"), ==, "setup"); + +qobject_unref (rsp); +} +/* * Note: caller is responsible to free the returned object via * qobject_unref() after use
tests/qtest/migration-helpers.h +4 -0
@@ -23,6 +23,10 @@ bool migrate_watch_for_resume(QTestState *who, const char *name, G_GNUC_PRINTF(3, 4)void migrate_qmp (QTestState *who,const char *uri,const char *fmt, ...); +G_GNUC_PRINTF(3, 4) +void migrate_incoming_qmp (QTestState *who,const char *uri, +const char *fmt, ...); +void migrate_set_capability (QTestState *who,const char *capability,bool value);
Signature · 1 line
2.35.3
PATCH v4 3/6 tests/qtest: migration: Use migrate_incoming_qmp where appropriate
In reply to Fabiano RosasUse the new migrate_incoming_qmp helper in the places that currently open-code calling migrate-incoming.
--- tests/qtest/meson.build | 1 + tests/qtest/migration-test.c | 12 ++--- tests/qtest/virtio-net-failover.c | 77 ++++--------------------------- 3 files changed, 14 insertions(+), 76 deletions(-)
tests/qtest/meson.build +1 -0
@@ -313,6 +313,7 @@ qtests = { 'tpm-tis-i2c-test': [io, tpmemu_files, 'qtest_aspeed.c'], 'tpm-tis-device-swtpm-test': [io, tpmemu_files, 'tpm-tis-util.c'], 'tpm-tis-device-test': [io, tpmemu_files, 'tpm-tis-util.c'], + 'virtio-net-failover': files('migration-helpers.c'), 'vmgenid-test': files('boot-sector.c', 'acpi-utils.c'), 'netdev-socket': files('netdev-socket.c', '../unit/socket-helpers.c'), }
tests/qtest/migration-test.c +4 -8
@@ -1846,8 +1846,7 @@ static void *test_migrate_fd_start_hook(QTestState *from,close (pair[0 ]);/* Start incoming migration from the 1st socket */ -qtest_qmp_assert_success (to,"{ 'execute': 'migrate-incoming'," -" 'arguments': { 'uri': 'fd:fd-mig' }}" ); +migrate_incoming_qmp (to,"fd:fd-mig" ,"{}" );/* Send the 2nd socket to the target */ qtest_qmp_fds_assert_success(from, &pair[1], 1,
@@ -2069,8 +2068,7 @@ test_migrate_precopy_tcp_multifd_start_common(QTestState *from,migrate_set_capability (to,"multifd" , true);/* Start incoming migration from the 1st socket */ -qtest_qmp_assert_success (to,"{ 'execute': 'migrate-incoming'," -" 'arguments': { 'uri': 'tcp:127.0.0.1:0' }}" ); +migrate_incoming_qmp (to,"tcp:127.0.0.1:0" ,"{}" );return NULL ; }
@@ -2322,8 +2320,7 @@ static void test_multifd_tcp_cancel(void)migrate_set_capability (to,"multifd" , true);/* Start incoming migration from the 1st socket */ -qtest_qmp_assert_success (to,"{ 'execute': 'migrate-incoming'," -" 'arguments': { 'uri': 'tcp:127.0.0.1:0' }}" ); +migrate_incoming_qmp (to,"tcp:127.0.0.1:0" ,"{}" );/* Wait for the first serial output from the source */ wait_for_serial ("src_serial" );
@@ -2353,8 +2350,7 @@ static void test_multifd_tcp_cancel(void)migrate_set_capability (to2,"multifd" , true);/* Start incoming migration from the 1st socket */ -qtest_qmp_assert_success (to2,"{ 'execute': 'migrate-incoming'," -" 'arguments': { 'uri': 'tcp:127.0.0.1:0' }}" ); +migrate_incoming_qmp (to2,"tcp:127.0.0.1:0" ,"{}" );g_free (uri); uri =migrate_get_socket_address (to2,"socket-address" );
tests/qtest/virtio-net-failover.c +9 -68
134 lines not on this page · raw message
Signature · 1 line
2.35.3
PATCH v4 4/6 migration: Set migration status early in incoming side
In reply to Fabiano RosasWe are sending a migration event of MIGRATION_STATUS_SETUP at qemu_start_incoming_migration but never actually setting the state.
This creates a window between qmp_migrate_incoming and process_incoming_migration_co where the migration status is still MIGRATION_STATUS_NONE. Calling query-migrate during this time will return an empty response even though the incoming migration command has already been issued.
Commit 7cf1fe6d68 ("migration: Add migration events on target side") has added support to the 'events' capability to the incoming part of migration, but chose to send the SETUP event without setting the state. I'm assuming this was a mistake.
This introduces a change in behavior, any QMP client waiting for the SETUP event will hang, unless it has previously enabled the 'events' capability. Having the capability enabled is sufficient to continue to receive the event.
--- migration/migration.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
migration/migration.c +5 -2
@@ -425,13 +425,16 @@ void migrate_add_address(SocketAddress *address)static void qemu_start_incoming_migration (const char *uri,Error **errp) {const char *p =NULL ; +MigrationIncomingState *mis =migration_incoming_get_current ();/* URI is not suitable for migration? */ if (!migration_channels_and_uri_compatible (uri, errp)) {return ; } -qapi_event_send_migration (MIGRATION_STATUS_SETUP ); +migrate_set_state (&mis->state,MIGRATION_STATUS_NONE , +MIGRATION_STATUS_SETUP ); +if (strstart (uri,"tcp:" , &p) ||strstart (uri,"unix:" ,NULL ) ||strstart (uri,"vsock:" ,NULL )) {
@@ -525,7 +528,7 @@ process_incoming_migration_co(void *opaque) mis->largest_page_size =qemu_ram_pagesize_largest ();postcopy_state_set (POSTCOPY_INCOMING_NONE ); -migrate_set_state (&mis->state,MIGRATION_STATUS_NONE , +migrate_set_state (&mis->state,MIGRATION_STATUS_SETUP ,MIGRATION_STATUS_ACTIVE ); mis->loadvm_co =qemu_coroutine_self ();
Signature · 1 line
2.35.3
PATCH v4 5/6 tests/qtest: migration: Add support for negative testing of qmp_migrate
In reply to Fabiano RosasThere is currently no way to write a test for errors that happened in qmp_migrate before the migration has started.
Add a version of qmp_migrate that ensures an error happens. To make use of it a test needs to set MigrateCommon.result as MIG_TEST_QMP_ERROR.
--- tests/qtest/libqtest.c | 33 +++++++++++++++++++++++++++++++++ tests/qtest/libqtest.h | 28 ++++++++++++++++++++++++++++ tests/qtest/migration-helpers.c | 20 ++++++++++++++++++++ tests/qtest/migration-helpers.h | 3 +++ tests/qtest/migration-test.c | 16 ++++++++++++---- 5 files changed, 96 insertions(+), 4 deletions(-)
tests/qtest/libqtest.c +33 -0
@@ -1248,6 +1248,28 @@ void qtest_memset(QTestState *s, uint64_t addr, uint8_t pattern, size_t size)qtest_rsp (s); } +QDict *qtest_vqmp_assert_failure_ref (QTestState *qts, +const char *fmt,va_list args) +{ +QDict *response; +QDict *ret; + + response =qtest_vqmp (qts, fmt, args); + +g_assert (response); +if (!qdict_haskey (response,"error" )) { +g_autoptr (GString) s =qobject_to_json_pretty (QOBJECT (response), true); +g_test_message ("%s" , s->str); + } +g_assert (qdict_haskey (response,"error" )); +g_assert (!qdict_haskey (response,"return" )); + ret =qdict_get_qdict (response,"error" ); +qobject_ref (ret); +qobject_unref (response); + +return ret; +} +QDict *qtest_vqmp_assert_success_ref (QTestState *qts,const char *fmt,va_list args) {
@@ -1310,6 +1332,17 @@ void qtest_vqmp_fds_assert_success(QTestState *qts, int *fds, size_t nfds, }#endif /* !_WIN32 */ +QDict *qtest_qmp_assert_failure_ref (QTestState *qts,const char *fmt, ...) +{ +QDict *response; +va_list ap; + +va_start (ap, fmt); + response =qtest_vqmp_assert_failure_ref (qts, fmt, ap); +va_end (ap); +return response; +} +QDict *qtest_qmp_assert_success_ref (QTestState *qts,const char *fmt, ...) {QDict *response;
tests/qtest/libqtest.h +28 -0
@@ -799,6 +799,34 @@ void qtest_vqmp_fds_assert_success(QTestState *qts, int *fds, size_t nfds,G_GNUC_PRINTF (4 ,0 );#endif /* !_WIN32 */ +/** +* qtest_qmp_assert_failure_ref: +* @qts: QTestState instance to operate on +* @fmt: QMP message to send to qemu, formatted like +* qobject_from_jsonf_nofail(). See parse_interpolation() for what's +* supported after '%'. +* +* Sends a QMP message to QEMU, asserts that an 'error' key is present in +* the response, and returns the response. +*/ +QDict *qtest_qmp_assert_failure_ref (QTestState *qts,const char *fmt, ...) +G_GNUC_PRINTF (2 ,3 ); + +/** +* qtest_vqmp_assert_failure_ref: +* @qts: QTestState instance to operate on +* @fmt: QMP message to send to qemu, formatted like +* qobject_from_jsonf_nofail(). See parse_interpolation() for what's +* supported after '%'. +* @args: variable arguments for @fmt +* +* Sends a QMP message to QEMU, asserts that an 'error' key is present in +* the response, and returns the response. +*/ +QDict *qtest_vqmp_assert_failure_ref (QTestState *qts, +const char *fmt,va_list args) +G_GNUC_PRINTF (2 ,0 ); +/** * qtest_qmp_assert_success_ref: * @qts: QTestState instance to operate on
tests/qtest/migration-helpers.c +20 -0
@@ -49,6 +49,26 @@ bool migrate_watch_for_resume(QTestState *who, const char *name,return false; } +void migrate_qmp_fail (QTestState *who,const char *uri,const char *fmt, ...) +{ +va_list ap; +QDict *args, *err; + +va_start (ap, fmt); + args =qdict_from_vjsonf_nofail (fmt, ap); +va_end (ap); + +g_assert (!qdict_haskey (args,"uri" )); +qdict_put_str (args,"uri" , uri); + + err =qtest_qmp_assert_failure_ref ( + who,"{ 'execute': 'migrate', 'arguments': %p}" , args); + +g_assert (qdict_haskey (err,"desc" )); + +qobject_unref (err); +} +/* * Send QMP command "migrate". * Arguments are built from @fmt... (formatted like
tests/qtest/migration-helpers.h +3 -0
@@ -27,6 +27,9 @@ G_GNUC_PRINTF(3, 4)void migrate_incoming_qmp (QTestState *who,const char *uri,const char *fmt, ...); +G_GNUC_PRINTF(3, 4) +void migrate_qmp_fail (QTestState *who,const char *uri,const char *fmt, ...); +void migrate_set_capability (QTestState *who,const char *capability,bool value);
tests/qtest/migration-test.c +12 -4
@@ -564,6 +564,8 @@ typedef struct {MIG_TEST_FAIL ,/* This test should fail, dest qemu should fail with abnormal status */ MIG_TEST_FAIL_DEST_QUIT_ERR , +/* The QMP command for this migration should fail with an error */ +MIG_TEST_QMP_ERROR , } result;/* Optional: set number of migration passes to wait for, if live==true */
@@ -1379,6 +1381,7 @@ static void test_precopy_common(MigrateCommon *args) {QTestState *from, *to;void *data_hook =NULL ; + g_autofree char *connect_uri = NULL;if (test_migrate_start (&from, &to, args->listen_uri, &args->start)) {return ;
@@ -1419,13 +1422,17 @@ static void test_precopy_common(MigrateCommon *args) }if (!args->connect_uri) { - g_autofree char *local_connect_uri = -migrate_get_socket_address (to,"socket-address" ); -migrate_qmp (from, local_connect_uri,"{}" ); + connect_uri =migrate_get_socket_address (to,"socket-address" ); }else { -migrate_qmp (from, args->connect_uri,"{}" ); + connect_uri =g_strdup (args->connect_uri); } +if (args->result ==MIG_TEST_QMP_ERROR ) { +migrate_qmp_fail (from, connect_uri,"{}" ); + goto finish; + } + +migrate_qmp (from, connect_uri,"{}" );if (args->result !=MIG_TEST_SUCCEED ) {bool allow_active = args->result ==MIG_TEST_FAIL ;
@@ -1474,6 +1481,7 @@ static void test_precopy_common(MigrateCommon *args)wait_for_serial ("dest_serial" ); } +finish:if (args->finish_hook) { args->finish_hook (from, to, data_hook); }
Signature · 1 line
2.35.3
PATCH v4 6/6 tests/qtest: migration-test: Add tests for file-based migration
In reply to Fabiano RosasAdd basic tests for file-based migration.
--- tests/qtest/migration-test.c | 99 ++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+)
tests/qtest/migration-test.c +99 -0
@@ -52,6 +52,10 @@ static bool got_dst_resume;*/ #define DIRTYLIMIT_TOLERANCE_RANGE 25/* MB/s */ +#define QEMU_VM_FILE_MAGIC 0x5145564d +#define FILE_TEST_FILENAME "migfile" +#define FILE_TEST_OFFSET 0x1000 +#if defined(__linux__)#include <sys/syscall.h> #include <sys/vfs.h>
@@ -762,6 +766,7 @@ static void test_migrate_end(QTestState *from, QTestState *to, bool test_dest)cleanup ("migsocket" );cleanup ("src_serial" );cleanup ("dest_serial" ); +cleanup (FILE_TEST_FILENAME ); }#ifdef CONFIG_GNUTLS
@@ -1459,11 +1464,28 @@ static void test_precopy_common(MigrateCommon *args)*/ wait_for_migration_complete (from); +/* +* For file based migration the target must begin its +* migration after the source has finished. +*/ +if (strstr (connect_uri,"file:" )) { +migrate_incoming_qmp (to, connect_uri,"{}" ); + } +if (!got_src_stop) {qtest_qmp_eventwait (from,"STOP" ); } }else {wait_for_migration_complete (from); + +/* +* For file based migration the target must begin its +* migration after the source has finished. +*/ +if (strstr (connect_uri,"file:" )) { +migrate_incoming_qmp (to, connect_uri,"{}" ); + } +/* * Must wait for dst to finish reading all incoming * data on the socket before issuing 'cont' otherwise
@@ -1681,6 +1703,75 @@ static void test_precopy_unix_compress_nowait(void)test_precopy_common (&args); } +static void test_precopy_file (void ) +{ + g_autofree char *uri = g_strdup_printf("file:%s/%s", tmpfs, +FILE_TEST_FILENAME ); +MigrateCommon args = { + .connect_uri = uri, + .listen_uri ="defer" , + }; + +test_precopy_common (&args); +} + +static void file_offset_finish_hook (QTestState *from,QTestState *to,void *opaque) +{ +#if defined(__linux__) + g_autofree char *path = g_strdup_printf("%s/%s", tmpfs, FILE_TEST_FILENAME); +size_t size =FILE_TEST_OFFSET +sizeof (QEMU_VM_FILE_MAGIC ); +uintptr_t *addr, *p; +int fd; + + fd =open (path,O_RDONLY ); +g_assert (fd !=-1 ); + addr =mmap (NULL , size,PROT_READ ,MAP_SHARED , fd,0 ); +g_assert (addr !=MAP_FAILED ); + +/* +* Ensure the skipped offset contains zeros and the migration +* stream starts at the right place. +*/ + p = addr; +while (p < addr +FILE_TEST_OFFSET /sizeof (uintptr_t )) { +g_assert (*p ==0 ); + p++; + } + g_assert_cmpint(cpu_to_be32(*p), ==, QEMU_VM_FILE_MAGIC); + +munmap (addr, size); +close (fd); +#endif +} + +static void test_precopy_file_offset (void ) +{ + g_autofree char *uri = g_strdup_printf("file:%s/%s,offset=%d", tmpfs, +FILE_TEST_FILENAME , +FILE_TEST_OFFSET ); +MigrateCommon args = { + .connect_uri = uri, + .listen_uri ="defer" , + .finish_hook = file_offset_finish_hook, + }; + +test_precopy_common (&args); +} + +static void test_precopy_file_offset_bad (void ) +{ +/* using a value not supported by qemu_strtosz() */ + g_autofree char *uri = g_strdup_printf("file:%s/%s,offset=0x20M", + tmpfs,FILE_TEST_FILENAME ); +MigrateCommon args = { + .connect_uri = uri, + .listen_uri ="defer" , + .result =MIG_TEST_QMP_ERROR , + }; + +test_precopy_common (&args); +} +static void test_precopy_tcp_plain (void ) {MigrateCommon args = {
@@ -2730,6 +2821,14 @@ int main(int argc, char **argv)qtest_add_func ("/migration/precopy/unix/compress/nowait" , test_precopy_unix_compress_nowait); } + +qtest_add_func ("/migration/precopy/file" , + test_precopy_file); +qtest_add_func ("/migration/precopy/file/offset" , + test_precopy_file_offset); +qtest_add_func ("/migration/precopy/file/offset/bad" , + test_precopy_file_offset_bad); +#ifdef CONFIG_GNUTLS qtest_add_func ("/migration/precopy/unix/tls/psk" , test_precopy_unix_tls_psk);
Signature · 1 line
2.35.3
Re: [PATCH v4 6/6] tests/qtest: migration-test: Add tests for file-based migration
Quoted 33 lines · Fabiano Rosas
Add basic tests for file-based migration.
Signed-off-by Fabiano Rosas <[email protected]>Reviewed-by Peter Xu <[email protected]>--- tests/qtest/migration-test.c | 99 ++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+)tests/qtest/migration-test.c +5
-0@@ -52,6 +52,10 @@ static bool got_dst_resume;*/ #define DIRTYLIMIT_TOLERANCE_RANGE 25/* MB/s */ +#define QEMU_VM_FILE_MAGIC 0x5145564d +#define FILE_TEST_FILENAME "migfile" +#define FILE_TEST_OFFSET 0x1000 +#if defined(__linux__)#include <sys/syscall.h> #include <sys/vfs.h> @@ -762,6 +766,7 @@ static void test_migrate_end(QTestState *from, QTestState *to, bool test_dest)cleanup ("migsocket" );cleanup ("src_serial" );cleanup ("dest_serial" ); +cleanup (FILE_TEST_FILENAME ); }#ifdef CONFIG_GNUTLS @@ -1459,11 +1464,28 @@ static void test_precopy_common(MigrateCommon *args)*/
tests/qtest/migration-test.c static void test_precopy_common(MigrateCommon *args) · line 1474
Quoted 10 lines
tests/qtest/migration-test.c +8
-0wait_for_migration_complete (from); +/* +* For file based migration the target must begin its +* migration after the source has finished. +*/ +if (strstr (connect_uri,"file:" )) { +migrate_incoming_qmp (to, connect_uri,"{}" ); + } +
This is now broken since we merged commit e02f56e3de ("tests/qtest:
massively speed up migration-test").
We cannot monitor the destination while the source is still running because we need the source to have finished writing to the file before we can start the destination. I'll have to think of another way of testing a migration that is done with a live source but asynchronous incoming migration.
Any suggestions are welcome.
Re: [PATCH v4 6/6] tests/qtest: migration-test: Add tests for file-based migration
Quoted 49 lines · Fabiano Rosas
Quoted 33 lines · Fabiano Rosas
Add basic tests for file-based migration.
Signed-off-by Fabiano Rosas <[email protected]>Reviewed-by Peter Xu <[email protected]>--- tests/qtest/migration-test.c | 99 ++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+)tests/qtest/migration-test.c +5
-0@@ -52,6 +52,10 @@ static bool got_dst_resume;*/ #define DIRTYLIMIT_TOLERANCE_RANGE 25/* MB/s */ +#define QEMU_VM_FILE_MAGIC 0x5145564d +#define FILE_TEST_FILENAME "migfile" +#define FILE_TEST_OFFSET 0x1000 +#if defined(__linux__)#include <sys/syscall.h> #include <sys/vfs.h> @@ -762,6 +766,7 @@ static void test_migrate_end(QTestState *from, QTestState *to, bool test_dest)cleanup ("migsocket" );cleanup ("src_serial" );cleanup ("dest_serial" ); +cleanup (FILE_TEST_FILENAME ); }#ifdef CONFIG_GNUTLS @@ -1459,11 +1464,28 @@ static void test_precopy_common(MigrateCommon *args)*/ tests/qtest/migration-test.c static void test_precopy_common(MigrateCommon *args) · line 1474
Quoted 10 lines
tests/qtest/migration-test.c +8
-0wait_for_migration_complete (from); +/* +* For file based migration the target must begin its +* migration after the source has finished. +*/ +if (strstr (connect_uri,"file:" )) { +migrate_incoming_qmp (to, connect_uri,"{}" ); + } +This is now broken since we merged commit
e02f56e3de("tests/qtest:
massively speed up migration-test").
Quoted 7 lines
We cannot monitor the destination while the source is still running because we need the source to have finished writing to the file before we can start the destination. I'll have to think of another way of testing a migration that is done with a live source but asynchronous incoming migration.
Any suggestions are welcome.
Don't use test_precopy_common() at all. This helper is written from the POV that we're actually doing a live migration. Migrate to/from file is not live migration.
So open code the subset of pieces of test_precopy_common() that you need for file migration. There are a handful of other tests that take this approach since test_precopy_common wasn't suitable for them eg test_migrate_auto_converge()
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|