From 55c36d5525751d4b2676e206680762769758d934 Mon Sep 17 00:00:00 2001 Message-Id: <55c36d5525751d4b2676e206680762769758d934.1387382496.git.minovotn@redhat.com> In-Reply-To: References: From: Nigel Croxon Date: Thu, 14 Nov 2013 22:52:55 +0100 Subject: [PATCH 19/46] rdma: account for the time spent in MIG_STATE_SETUP through QMP RH-Author: Nigel Croxon Message-id: <1384469598-13137-20-git-send-email-ncroxon@redhat.com> Patchwork-id: 55701 O-Subject: [RHEL7.0 PATCH 19/42] rdma: account for the time spent in MIG_STATE_SETUP through QMP Bugzilla: 1011720 RH-Acked-by: Orit Wasserman RH-Acked-by: Amit Shah RH-Acked-by: Paolo Bonzini Bugzilla: 1011720 https://bugzilla.redhat.com/show_bug.cgi?id=1011720 >From commit ID: commit ed4fbd10823a7b0dbded6b481a68973e47f7e14d Author: Michael R. Hines Date: Mon Jul 22 10:01:58 2013 -0400 rdma: account for the time spent in MIG_STATE_SETUP through QMP Using the previous patches, we're now able to timestamp the SETUP state. Once we have this time, let the user know about it in the schema. Reviewed-by: Juan Quintela Reviewed-by: Eric Blake Signed-off-by: Michael R. Hines Signed-off-by: Juan Quintela --- hmp.c | 4 ++++ include/migration/migration.h | 1 + migration.c | 9 +++++++++ qapi-schema.json | 9 ++++++++- 4 files changed, 22 insertions(+), 1 deletions(-) Signed-off-by: Michal Novotny --- hmp.c | 4 ++++ include/migration/migration.h | 1 + migration.c | 9 +++++++++ qapi-schema.json | 9 ++++++++- 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/hmp.c b/hmp.c index 316e6a1..841929d 100644 --- a/hmp.c +++ b/hmp.c @@ -162,6 +162,10 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict) monitor_printf(mon, "downtime: %" PRIu64 " milliseconds\n", info->downtime); } + if (info->has_setup_time) { + monitor_printf(mon, "setup: %" PRIu64 " milliseconds\n", + info->setup_time); + } } if (info->has_ram) { diff --git a/include/migration/migration.h b/include/migration/migration.h index 13a9629..08c772d 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -49,6 +49,7 @@ struct MigrationState int64_t dirty_bytes_rate; bool enabled_capabilities[MIGRATION_CAPABILITY_MAX]; int64_t xbzrle_cache_size; + int64_t setup_time; }; void process_incoming_migration(QEMUFile *f); diff --git a/migration.c b/migration.c index ddbfd45..4f070a3 100644 --- a/migration.c +++ b/migration.c @@ -191,6 +191,7 @@ MigrationInfo *qmp_query_migrate(Error **errp) case MIG_STATE_SETUP: info->has_status = true; info->status = g_strdup("setup"); + info->has_total_time = false; break; case MIG_STATE_ACTIVE: info->has_status = true; @@ -200,6 +201,8 @@ MigrationInfo *qmp_query_migrate(Error **errp) - s->total_time; info->has_expected_downtime = true; info->expected_downtime = s->expected_downtime; + info->has_setup_time = true; + info->setup_time = s->setup_time; info->has_ram = true; info->ram = g_malloc0(sizeof(*info->ram)); @@ -232,6 +235,8 @@ MigrationInfo *qmp_query_migrate(Error **errp) info->total_time = s->total_time; info->has_downtime = true; info->downtime = s->downtime; + info->has_setup_time = true; + info->setup_time = s->setup_time; info->has_ram = true; info->ram = g_malloc0(sizeof(*info->ram)); @@ -548,6 +553,7 @@ static void *migration_thread(void *opaque) { MigrationState *s = opaque; int64_t initial_time = qemu_get_clock_ms(rt_clock); + int64_t setup_start = qemu_get_clock_ms(host_clock); int64_t initial_bytes = 0; int64_t max_size = 0; int64_t start_time = initial_time; @@ -556,8 +562,11 @@ static void *migration_thread(void *opaque) DPRINTF("beginning savevm\n"); qemu_savevm_state_begin(s->file, &s->params); + s->setup_time = qemu_get_clock_ms(host_clock) - setup_start; migrate_set_state(s, MIG_STATE_SETUP, MIG_STATE_ACTIVE); + DPRINTF("setup complete\n"); + while (s->state == MIG_STATE_ACTIVE) { int64_t current_time; uint64_t pending_size; diff --git a/qapi-schema.json b/qapi-schema.json index bf1fe68..7333b8f 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -634,6 +634,12 @@ # expected downtime in milliseconds for the guest in last walk # of the dirty bitmap. (since 1.3) # +# @setup-time: #optional amount of setup time in milliseconds _before_ the +# iterations begin but _after_ the QMP command is issued. This is designed +# to provide an accounting of any activities (such as RDMA pinning) which +# may be expensive, but do not actually occur during the iterative +# migration rounds themselves. (since 1.6) +# # Since: 0.14.0 ## { 'type': 'MigrationInfo', @@ -642,7 +648,8 @@ '*xbzrle-cache': 'XBZRLECacheStats', '*total-time': 'int', '*expected-downtime': 'int', - '*downtime': 'int'} } + '*downtime': 'int', + '*setup-time': 'int'} } ## # @query-migrate -- 1.7.11.7