Skip to content

Commit

Permalink
tests/qtest/migration: Add multifd_tcp_plain test using list of chann…
Browse files Browse the repository at this point in the history
…els instead of uri

Add a positive test to check multifd live migration but this time
using list of channels (restricted to 1) as the starting point
instead of simple uri string.

Signed-off-by: Het Gala <het.gala@nutanix.com>
Suggested-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Link: https://lore.kernel.org/r/20240312202634.63349-8-het.gala@nutanix.com
Signed-off-by: Peter Xu <peterx@redhat.com>
  • Loading branch information
hetgala99 authored and xzpeter committed Apr 23, 2024
1 parent d5ee387 commit 9d36d62
Showing 1 changed file with 28 additions and 4 deletions.
32 changes: 28 additions & 4 deletions tests/qtest/migration-test.c
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,13 @@ typedef struct {
*/
const char *connect_uri;

/*
* Optional: JSON-formatted list of src QEMU URIs. If a port is
* defined as '0' in any QDict key a value of '0' will be
* automatically converted to the correct destination port.
*/
const char *connect_channels;

/* Optional: callback to run at start to set migration parameters */
TestMigrateStartHook start_hook;
/* Optional: callback to run at finish to cleanup */
Expand Down Expand Up @@ -1721,7 +1728,7 @@ static void test_precopy_common(MigrateCommon *args)
goto finish;
}

migrate_qmp(from, to, args->connect_uri, NULL, "{}");
migrate_qmp(from, to, args->connect_uri, args->connect_channels, "{}");

if (args->result != MIG_TEST_SUCCEED) {
bool allow_active = args->result == MIG_TEST_FAIL;
Expand Down Expand Up @@ -2721,7 +2728,7 @@ test_migrate_precopy_tcp_multifd_zstd_start(QTestState *from,
}
#endif /* CONFIG_ZSTD */

static void test_multifd_tcp_none(void)
static void test_multifd_tcp_uri_none(void)
{
MigrateCommon args = {
.listen_uri = "defer",
Expand Down Expand Up @@ -2766,6 +2773,21 @@ static void test_multifd_tcp_no_zero_page(void)
test_precopy_common(&args);
}

static void test_multifd_tcp_channels_none(void)
{
MigrateCommon args = {
.listen_uri = "defer",
.start_hook = test_migrate_precopy_tcp_multifd_start,
.live = true,
.connect_channels = "[ { 'channel-type': 'main',"
" 'addr': { 'transport': 'socket',"
" 'type': 'inet',"
" 'host': '127.0.0.1',"
" 'port': '0' } } ]",
};
test_precopy_common(&args);
}

static void test_multifd_tcp_zlib(void)
{
MigrateCommon args = {
Expand Down Expand Up @@ -3669,8 +3691,10 @@ int main(int argc, char **argv)
test_migrate_dirty_limit);
}
}
migration_test_add("/migration/multifd/tcp/plain/none",
test_multifd_tcp_none);
migration_test_add("/migration/multifd/tcp/uri/plain/none",
test_multifd_tcp_uri_none);
migration_test_add("/migration/multifd/tcp/channels/plain/none",
test_multifd_tcp_channels_none);
migration_test_add("/migration/multifd/tcp/plain/zero-page/legacy",
test_multifd_tcp_zero_page_legacy);
migration_test_add("/migration/multifd/tcp/plain/zero-page/none",
Expand Down

0 comments on commit 9d36d62

Please sign in to comment.