[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/8] migration: print total downtime for final phase
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 5/8] migration: print total downtime for final phase of migration |
Date: |
Sat, 18 Aug 2012 13:17:12 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
hmp.c | 4 ++++
migration.c | 6 +++++-
migration.h | 1 +
qapi-schema.json | 7 ++++++-
qmp-commands.hx | 3 +++
5 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/hmp.c b/hmp.c
index 81c8acb..8f24d9d 100644
--- a/hmp.c
+++ b/hmp.c
@@ -151,6 +151,10 @@ void hmp_info_migrate(Monitor *mon)
monitor_printf(mon, "Migration status: %s\n", info->status);
monitor_printf(mon, "total time: %" PRIu64 " milliseconds\n",
info->total_time);
+ if (info->has_downtime) {
+ monitor_printf(mon, "downtime: %" PRIu64 " milliseconds\n",
+ info->downtime);
+ }
}
if (info->has_ram) {
diff --git a/migration.c b/migration.c
index 159728d..49cd336 100644
--- a/migration.c
+++ b/migration.c
@@ -194,6 +194,8 @@ MigrationInfo *qmp_query_migrate(Error **errp)
info->has_status = true;
info->status = g_strdup("completed");
info->total_time = s->total_time;
+ info->has_downtime = true;
+ info->downtime = s->downtime;
info->has_ram = true;
info->ram = g_malloc0(sizeof(*info->ram));
@@ -326,9 +328,10 @@ static void migrate_fd_put_ready(void *opaque)
migrate_fd_error(s);
} else if (ret == 1) {
int old_vm_running = runstate_is_running();
- int64_t end_time;
+ int64_t start_time, end_time;
DPRINTF("done iterating\n");
+ start_time = qemu_get_clock_ms(rt_clock);
qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);
vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
@@ -339,6 +342,7 @@ static void migrate_fd_put_ready(void *opaque)
}
end_time = qemu_get_clock_ms(rt_clock);
s->total_time = end_time - s->total_time;
+ s->downtime = end_time - start_time;
if (s->state != MIG_STATE_COMPLETED) {
if (old_vm_running) {
vm_start();
diff --git a/migration.h b/migration.h
index a9852fc..3462917 100644
--- a/migration.h
+++ b/migration.h
@@ -40,6 +40,7 @@ struct MigrationState
void *opaque;
MigrationParams params;
int64_t total_time;
+ int64_t downtime;
bool enabled_capabilities[MIGRATION_CAPABILITY_MAX];
int64_t xbzrle_cache_size;
};
diff --git a/qapi-schema.json b/qapi-schema.json
index f83cf22..29f601a 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -349,13 +349,18 @@
# If migration has ended, it returns the total migration
# time. (since 1.2)
#
+# @downtime: #optional only present when migration finishes correctly
+# total downtime in milliseconds for the guest.
+# (since 1.2)
+#
# Since: 0.14.0
##
{ 'type': 'MigrationInfo',
'data': {'*status': 'str', '*ram': 'MigrationStats',
'*disk': 'MigrationStats',
'*xbzrle-cache': 'XBZRLECacheStats',
- 'total-time': 'int'} }
+ 'total-time': 'int',
+ '*downtime': 'int'} }
##
# @query-migrate
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 8671bf3..b5ca99f 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -2242,6 +2242,8 @@ The main json-object contains the following:
- "total-time": total amount of ms since migration started. If
migration has ended, it returns the total migration
time (json-int)
+- "downtime": only present when migration has finished correctly
+ total amount in ms for downtime that happened (json-int)
- "ram": only present if "status" is "active", it is a json-object with the
following RAM information (in bytes):
- "transferred": amount transferred (json-int)
@@ -2279,6 +2281,7 @@ Examples:
"remaining":123,
"total":246,
"total-time":12345,
+ "expected-downtime":12345,
"duplicate":123,
"normal":123,
"normal-bytes":123456
--
1.7.11.2
- [Qemu-devel] [PATCH 2/8] fix migration sync, (continued)
- [Qemu-devel] [PATCH 2/8] fix migration sync, Juan Quintela, 2012/08/18
- [Qemu-devel] [PATCH 3/8] migration: move total_time from ram stats to migration info, Juan Quintela, 2012/08/18
- [Qemu-devel] [PATCH 4/8] migration: store end_time in a local variable, Juan Quintela, 2012/08/18
- [Qemu-devel] [PATCH 6/8] migration: rename expected_time to expected_downtime, Juan Quintela, 2012/08/18
- [Qemu-devel] [PATCH 7/8] migration: export migrate_get_current(), Juan Quintela, 2012/08/18
- [Qemu-devel] [PATCH 5/8] migration: print total downtime for final phase of migration,
Juan Quintela <=
- [Qemu-devel] [PATCH 8/8] migration: print expected downtime in info migrate, Juan Quintela, 2012/08/18