Message ID | 20171201125813.1437-5-quintela@redhat.com |
---|---|
State | New |
Headers | show |
Series | Add make check tests for Migration | expand |
* Juan Quintela (quintela@redhat.com) wrote: > Not sharing code from precopy/unix because we have to read back the > tcp parameter. > > Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > tests/migration-test.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++--- > 1 file changed, 56 insertions(+), 3 deletions(-) > > diff --git a/tests/migration-test.c b/tests/migration-test.c > index 3f3f056be6..841c89e28a 100644 > --- a/tests/migration-test.c > +++ b/tests/migration-test.c > @@ -354,8 +354,7 @@ static void cleanup(const char *filename) > g_free(path); > } > > -static void migrate_check_parameter(QTestState *who, const char *parameter, > - const char *value) > +static char *migrate_get_parameter(QTestState *who, const char *parameter) > { > QDict *rsp, *rsp_return; > char *result; > @@ -364,9 +363,18 @@ static void migrate_check_parameter(QTestState *who, const char *parameter, > rsp_return = qdict_get_qdict(rsp, "return"); > result = g_strdup_printf("%" PRId64, > qdict_get_try_int(rsp_return, parameter, -1)); > + QDECREF(rsp); > + return result; > +} > + > +static void migrate_check_parameter(QTestState *who, const char *parameter, > + const char *value) > +{ > + char *result; > + > + result = migrate_get_parameter(who, parameter); > g_assert_cmpstr(result, ==, value); > g_free(result); > - QDECREF(rsp); > } > > static void deprecated_set_downtime(QTestState *who, const double value) > @@ -621,6 +629,50 @@ static void test_precopy_unix(void) > g_free(uri); > } > > +static void test_precopy_tcp(void) > +{ > + char *uri; > + char *port; > + QTestState *from, *to; > + > + test_migrate_start(&from, &to, "tcp:127.0.0.1:0"); > + > + /* We want to pick a speed slow enough that the test completes > + * quickly, but that it doesn't complete precopy even on a slow > + * machine, so also set the downtime. > + */ > + /* 1 ms */ > + migrate_set_parameter(from, "downtime-limit", "1"); > + /* 1GB/s slow*/ > + migrate_set_parameter(from, "max-bandwidth", "1000000000"); > + > + /* Wait for the first serial output from the source */ > + wait_for_serial("src_serial"); > + > + port = migrate_get_parameter(to, "tcp-port"); > + uri = g_strdup_printf("tcp:127.0.0.1:%s", port); > + > + migrate(from, uri); > + > + wait_for_migration_pass(from); > + > + /* 300 ms should converge */ > + migrate_set_parameter(from, "downtime-limit", "300"); > + > + if (!got_stop) { > + qtest_qmp_eventwait(from, "STOP"); > + } > + > + qtest_qmp_eventwait(to, "RESUME"); > + > + wait_for_serial("dest_serial"); > + wait_for_migration_complete(from); > + > + test_migrate_end(from, to); > + g_free(uri); > + g_free(port); > +} > + > int main(int argc, char **argv) > { > char template[] = "/tmp/migration-test-XXXXXX"; > @@ -641,6 +693,7 @@ int main(int argc, char **argv) > module_call_init(MODULE_INIT_QOM); > > qtest_add_func("/migration/precopy/unix", test_precopy_unix); > + qtest_add_func("/migration/precopy/tcp", test_precopy_tcp); > qtest_add_func("/migration/postcopy/unix", test_postcopy); > > ret = g_test_run(); > -- > 2.14.3 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/tests/migration-test.c b/tests/migration-test.c index 3f3f056be6..841c89e28a 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -354,8 +354,7 @@ static void cleanup(const char *filename) g_free(path); } -static void migrate_check_parameter(QTestState *who, const char *parameter, - const char *value) +static char *migrate_get_parameter(QTestState *who, const char *parameter) { QDict *rsp, *rsp_return; char *result; @@ -364,9 +363,18 @@ static void migrate_check_parameter(QTestState *who, const char *parameter, rsp_return = qdict_get_qdict(rsp, "return"); result = g_strdup_printf("%" PRId64, qdict_get_try_int(rsp_return, parameter, -1)); + QDECREF(rsp); + return result; +} + +static void migrate_check_parameter(QTestState *who, const char *parameter, + const char *value) +{ + char *result; + + result = migrate_get_parameter(who, parameter); g_assert_cmpstr(result, ==, value); g_free(result); - QDECREF(rsp); } static void deprecated_set_downtime(QTestState *who, const double value) @@ -621,6 +629,50 @@ static void test_precopy_unix(void) g_free(uri); } +static void test_precopy_tcp(void) +{ + char *uri; + char *port; + QTestState *from, *to; + + test_migrate_start(&from, &to, "tcp:127.0.0.1:0"); + + /* We want to pick a speed slow enough that the test completes + * quickly, but that it doesn't complete precopy even on a slow + * machine, so also set the downtime. + */ + /* 1 ms */ + migrate_set_parameter(from, "downtime-limit", "1"); + /* 1GB/s slow*/ + migrate_set_parameter(from, "max-bandwidth", "1000000000"); + + /* Wait for the first serial output from the source */ + wait_for_serial("src_serial"); + + port = migrate_get_parameter(to, "tcp-port"); + uri = g_strdup_printf("tcp:127.0.0.1:%s", port); + + migrate(from, uri); + + wait_for_migration_pass(from); + + /* 300 ms should converge */ + migrate_set_parameter(from, "downtime-limit", "300"); + + if (!got_stop) { + qtest_qmp_eventwait(from, "STOP"); + } + + qtest_qmp_eventwait(to, "RESUME"); + + wait_for_serial("dest_serial"); + wait_for_migration_complete(from); + + test_migrate_end(from, to); + g_free(uri); + g_free(port); +} + int main(int argc, char **argv) { char template[] = "/tmp/migration-test-XXXXXX"; @@ -641,6 +693,7 @@ int main(int argc, char **argv) module_call_init(MODULE_INIT_QOM); qtest_add_func("/migration/precopy/unix", test_precopy_unix); + qtest_add_func("/migration/precopy/tcp", test_precopy_tcp); qtest_add_func("/migration/postcopy/unix", test_postcopy); ret = g_test_run();
Not sharing code from precopy/unix because we have to read back the tcp parameter. Signed-off-by: Juan Quintela <quintela@redhat.com> --- tests/migration-test.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 3 deletions(-)