migration: print total downtime for final phase of migration
Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Orit Wasserman <owasserm@redhat.com>
This commit is contained in:
parent
97d4d961d9
commit
9c5a9fcf53
4
hmp.c
4
hmp.c
@ -152,6 +152,10 @@ void hmp_info_migrate(Monitor *mon)
|
|||||||
monitor_printf(mon, "Migration status: %s\n", info->status);
|
monitor_printf(mon, "Migration status: %s\n", info->status);
|
||||||
monitor_printf(mon, "total time: %" PRIu64 " milliseconds\n",
|
monitor_printf(mon, "total time: %" PRIu64 " milliseconds\n",
|
||||||
info->total_time);
|
info->total_time);
|
||||||
|
if (info->has_downtime) {
|
||||||
|
monitor_printf(mon, "downtime: %" PRIu64 " milliseconds\n",
|
||||||
|
info->downtime);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (info->has_ram) {
|
if (info->has_ram) {
|
||||||
|
@ -195,6 +195,8 @@ MigrationInfo *qmp_query_migrate(Error **errp)
|
|||||||
info->has_status = true;
|
info->has_status = true;
|
||||||
info->status = g_strdup("completed");
|
info->status = g_strdup("completed");
|
||||||
info->total_time = s->total_time;
|
info->total_time = s->total_time;
|
||||||
|
info->has_downtime = true;
|
||||||
|
info->downtime = s->downtime;
|
||||||
|
|
||||||
info->has_ram = true;
|
info->has_ram = true;
|
||||||
info->ram = g_malloc0(sizeof(*info->ram));
|
info->ram = g_malloc0(sizeof(*info->ram));
|
||||||
@ -329,9 +331,10 @@ static void migrate_fd_put_ready(void *opaque)
|
|||||||
migrate_fd_error(s);
|
migrate_fd_error(s);
|
||||||
} else if (ret == 1) {
|
} else if (ret == 1) {
|
||||||
int old_vm_running = runstate_is_running();
|
int old_vm_running = runstate_is_running();
|
||||||
int64_t end_time;
|
int64_t start_time, end_time;
|
||||||
|
|
||||||
DPRINTF("done iterating\n");
|
DPRINTF("done iterating\n");
|
||||||
|
start_time = qemu_get_clock_ms(rt_clock);
|
||||||
qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);
|
qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);
|
||||||
vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
|
vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
|
||||||
|
|
||||||
@ -342,6 +345,7 @@ static void migrate_fd_put_ready(void *opaque)
|
|||||||
}
|
}
|
||||||
end_time = qemu_get_clock_ms(rt_clock);
|
end_time = qemu_get_clock_ms(rt_clock);
|
||||||
s->total_time = end_time - s->total_time;
|
s->total_time = end_time - s->total_time;
|
||||||
|
s->downtime = end_time - start_time;
|
||||||
if (s->state != MIG_STATE_COMPLETED) {
|
if (s->state != MIG_STATE_COMPLETED) {
|
||||||
if (old_vm_running) {
|
if (old_vm_running) {
|
||||||
vm_start();
|
vm_start();
|
||||||
|
@ -40,6 +40,7 @@ struct MigrationState
|
|||||||
void *opaque;
|
void *opaque;
|
||||||
MigrationParams params;
|
MigrationParams params;
|
||||||
int64_t total_time;
|
int64_t total_time;
|
||||||
|
int64_t downtime;
|
||||||
bool enabled_capabilities[MIGRATION_CAPABILITY_MAX];
|
bool enabled_capabilities[MIGRATION_CAPABILITY_MAX];
|
||||||
int64_t xbzrle_cache_size;
|
int64_t xbzrle_cache_size;
|
||||||
};
|
};
|
||||||
|
@ -438,13 +438,18 @@
|
|||||||
# If migration has ended, it returns the total migration
|
# If migration has ended, it returns the total migration
|
||||||
# time. (since 1.2)
|
# time. (since 1.2)
|
||||||
#
|
#
|
||||||
|
# @downtime: #optional only present when migration finishes correctly
|
||||||
|
# total downtime in milliseconds for the guest.
|
||||||
|
# (since 1.3)
|
||||||
|
#
|
||||||
# Since: 0.14.0
|
# Since: 0.14.0
|
||||||
##
|
##
|
||||||
{ 'type': 'MigrationInfo',
|
{ 'type': 'MigrationInfo',
|
||||||
'data': {'*status': 'str', '*ram': 'MigrationStats',
|
'data': {'*status': 'str', '*ram': 'MigrationStats',
|
||||||
'*disk': 'MigrationStats',
|
'*disk': 'MigrationStats',
|
||||||
'*xbzrle-cache': 'XBZRLECacheStats',
|
'*xbzrle-cache': 'XBZRLECacheStats',
|
||||||
'*total-time': 'int'} }
|
'*total-time': 'int',
|
||||||
|
'*downtime': 'int'} }
|
||||||
|
|
||||||
##
|
##
|
||||||
# @query-migrate
|
# @query-migrate
|
||||||
|
@ -2304,6 +2304,8 @@ The main json-object contains the following:
|
|||||||
- "total-time": total amount of ms since migration started. If
|
- "total-time": total amount of ms since migration started. If
|
||||||
migration has ended, it returns the total migration
|
migration has ended, it returns the total migration
|
||||||
time (json-int)
|
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
|
- "ram": only present if "status" is "active", it is a json-object with the
|
||||||
following RAM information (in bytes):
|
following RAM information (in bytes):
|
||||||
- "transferred": amount transferred (json-int)
|
- "transferred": amount transferred (json-int)
|
||||||
@ -2341,6 +2343,7 @@ Examples:
|
|||||||
"remaining":123,
|
"remaining":123,
|
||||||
"total":246,
|
"total":246,
|
||||||
"total-time":12345,
|
"total-time":12345,
|
||||||
|
"downtime":12345,
|
||||||
"duplicate":123,
|
"duplicate":123,
|
||||||
"normal":123,
|
"normal":123,
|
||||||
"normal-bytes":123456
|
"normal-bytes":123456
|
||||||
|
Loading…
Reference in New Issue
Block a user