| Message ID | 20231018192741.25885-11-farosas@suse.de |
|---|---|
| State | New |
| Headers | show |
| Series | tests/migration-test: Allow testing older machine types | expand |
On 18/10/2023 21.27, Fabiano Rosas wrote: > We have strict rules around migration compatibility between different > QEMU versions but no test to validate the migration state between > different binaries. > > Add infrastructure to allow running the migration tests with two > different QEMU binaries as migration source and destination. > > The code now recognizes two new environment variables > QTEST_QEMU_BINARY_SRC and QTEST_QEMU_BINARY_DST. In the absence of > either of them, the test will use the QTEST_QEMU_BINARY variable. If > both are missing then the tests are run with single binary as > previously. > > The machine type is selected automatically as the latest machine type > version that works with both binaries. > > Usage (only one of SRC|DST is allowed): > > QTEST_QEMU_BINARY_SRC=../build-8.2.0/qemu-system-x86_64 \ > QTEST_QEMU_BINARY=../build-8.1.0/qemu-system-x86_64 \ > ./tests/qtest/migration-test > > Reviewed-by: Juan Quintela <quintela@redhat.com> > Signed-off-by: Fabiano Rosas <farosas@suse.de> > --- > tests/qtest/migration-test.c | 28 ++++++++++++++++++++++++---- > 1 file changed, 24 insertions(+), 4 deletions(-) Reviewed-by: Thomas Huth <thuth@redhat.com> I wonder whether we could test this in the gitlab-CI, too, e.g. by using a Debian container and installing the qemu-system-x86_64 from the Debian distro there (since this should be close enough to an older version of an upstream release), then run the test with that version from Debian and the one that has just been compiled from the master branch? Anyway, just an idea, this can certainly be done later. Thomas
Thomas Huth <thuth@redhat.com> wrote: > On 18/10/2023 21.27, Fabiano Rosas wrote: >> We have strict rules around migration compatibility between different >> QEMU versions but no test to validate the migration state between >> different binaries. >> Add infrastructure to allow running the migration tests with two >> different QEMU binaries as migration source and destination. >> The code now recognizes two new environment variables >> QTEST_QEMU_BINARY_SRC and QTEST_QEMU_BINARY_DST. In the absence of >> either of them, the test will use the QTEST_QEMU_BINARY variable. If >> both are missing then the tests are run with single binary as >> previously. >> The machine type is selected automatically as the latest machine >> type >> version that works with both binaries. >> Usage (only one of SRC|DST is allowed): >> QTEST_QEMU_BINARY_SRC=../build-8.2.0/qemu-system-x86_64 \ >> QTEST_QEMU_BINARY=../build-8.1.0/qemu-system-x86_64 \ >> ./tests/qtest/migration-test >> Reviewed-by: Juan Quintela <quintela@redhat.com> >> Signed-off-by: Fabiano Rosas <farosas@suse.de> >> --- >> tests/qtest/migration-test.c | 28 ++++++++++++++++++++++++---- >> 1 file changed, 24 insertions(+), 4 deletions(-) > > Reviewed-by: Thomas Huth <thuth@redhat.com> > > I wonder whether we could test this in the gitlab-CI, too, e.g. by > using a Debian container and installing the qemu-system-x86_64 from > the Debian distro there (since this should be close enough to an older > version of an upstream release), then run the test with that version > from Debian and the one that has just been compiled from the master > branch? Anyway, just an idea, this can certainly be done later. My idea would be to modify the container to create two trees: - last released version - upstream tip And just use that two binaries with the upstream one handling this. Later, Juan.
Thomas Huth <thuth@redhat.com> writes: > On 18/10/2023 21.27, Fabiano Rosas wrote: >> We have strict rules around migration compatibility between different >> QEMU versions but no test to validate the migration state between >> different binaries. >> >> Add infrastructure to allow running the migration tests with two >> different QEMU binaries as migration source and destination. >> >> The code now recognizes two new environment variables >> QTEST_QEMU_BINARY_SRC and QTEST_QEMU_BINARY_DST. In the absence of >> either of them, the test will use the QTEST_QEMU_BINARY variable. If >> both are missing then the tests are run with single binary as >> previously. >> >> The machine type is selected automatically as the latest machine type >> version that works with both binaries. >> >> Usage (only one of SRC|DST is allowed): >> >> QTEST_QEMU_BINARY_SRC=../build-8.2.0/qemu-system-x86_64 \ >> QTEST_QEMU_BINARY=../build-8.1.0/qemu-system-x86_64 \ >> ./tests/qtest/migration-test >> >> Reviewed-by: Juan Quintela <quintela@redhat.com> >> Signed-off-by: Fabiano Rosas <farosas@suse.de> >> --- >> tests/qtest/migration-test.c | 28 ++++++++++++++++++++++++---- >> 1 file changed, 24 insertions(+), 4 deletions(-) > > Reviewed-by: Thomas Huth <thuth@redhat.com> > > I wonder whether we could test this in the gitlab-CI, too, e.g. by using a > Debian container and installing the qemu-system-x86_64 from the Debian > distro there (since this should be close enough to an older version of an > upstream release), then run the test with that version from Debian and the > one that has just been compiled from the master branch? Anyway, just an > idea, this can certainly be done later. Yes, something like this is the goal. It's not in this series because my docker-fu is a bit rusty, so I didn't want to delay the qtest part. I think taking a built-from-tree QEMU would be better than a distro-shipped one. I also think that we should have this disabled in CI, due to the issues I described in the other thread. And possibly enable it with fewer migration-test tests. I don't see the need to run *all* of the migration-tests in this "compat testing" scheme.
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index b718634b1c..51f5603aac 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -71,6 +71,8 @@ static bool got_dst_resume; #define QEMU_VM_FILE_MAGIC 0x5145564d #define FILE_TEST_FILENAME "migfile" #define FILE_TEST_OFFSET 0x1000 +#define QEMU_ENV_SRC "QTEST_QEMU_BINARY_SRC" +#define QEMU_ENV_DST "QTEST_QEMU_BINARY_DST" #if defined(__linux__) #include <sys/syscall.h> @@ -744,6 +746,7 @@ static int test_migrate_start(QTestState **from, QTestState **to, const char *arch = qtest_get_arch(); const char *memory_size; const char *machine_alias, *machine_opts = ""; + g_autofree char *machine = NULL; if (args->use_shmem) { if (!g_file_test("/dev/shm", G_FILE_TEST_IS_DIR)) { @@ -822,6 +825,10 @@ static int test_migrate_start(QTestState **from, QTestState **to, kvm_opts = ",dirty-ring-size=4096"; } + machine = find_common_machine_version(machine_alias, QEMU_ENV_SRC, + QEMU_ENV_DST); + g_test_message("Using machine type: %s", machine); + cmd_source = g_strdup_printf("-accel kvm%s -accel tcg " "-machine %s,%s " "-name source,debug-threads=on " @@ -829,7 +836,7 @@ static int test_migrate_start(QTestState **from, QTestState **to, "-serial file:%s/src_serial " "%s %s %s %s %s", kvm_opts ? kvm_opts : "", - machine_alias, machine_opts, + machine, machine_opts, memory_size, tmpfs, arch_opts ? arch_opts : "", arch_source ? arch_source : "", @@ -837,7 +844,7 @@ static int test_migrate_start(QTestState **from, QTestState **to, args->opts_source ? args->opts_source : "", ignore_stderr); if (!args->only_target) { - *from = qtest_init(cmd_source); + *from = qtest_init_with_env(QEMU_ENV_SRC, cmd_source); qtest_qmp_set_event_callback(*from, migrate_watch_for_stop, &got_src_stop); @@ -851,14 +858,14 @@ static int test_migrate_start(QTestState **from, QTestState **to, "-incoming %s " "%s %s %s %s %s", kvm_opts ? kvm_opts : "", - machine_alias, machine_opts, + machine, machine_opts, memory_size, tmpfs, uri, arch_opts ? arch_opts : "", arch_target ? arch_target : "", shmem_opts ? shmem_opts : "", args->opts_target ? args->opts_target : "", ignore_stderr); - *to = qtest_init(cmd_target); + *to = qtest_init_with_env(QEMU_ENV_DST, cmd_target); qtest_qmp_set_event_callback(*to, migrate_watch_for_resume, &got_dst_resume); @@ -2989,10 +2996,23 @@ int main(int argc, char **argv) bool has_uffd; const char *arch; g_autoptr(GError) err = NULL; + const char *qemu_src = getenv(QEMU_ENV_SRC); + const char *qemu_dst = getenv(QEMU_ENV_DST); int ret; g_test_init(&argc, &argv, NULL); + /* + * The default QTEST_QEMU_BINARY must always be provided because + * that is what helpers use to query the accel type and + * architecture. + */ + if (qemu_src && qemu_dst) { + g_test_message("Only one of %s, %s is allowed", + QEMU_ENV_SRC, QEMU_ENV_DST); + exit(1); + } + has_kvm = qtest_has_accel("kvm"); has_tcg = qtest_has_accel("tcg");