Commit d5f8a570 authored by Juan Quintela's avatar Juan Quintela
Browse files

Add spent time for migration 



We add time spent for migration to the output of "info migrate"
command.  'total_time' means time since the start fo migration if
migration is 'active', and total time of migration if migration is
completed.  As we are also interested in transferred ram when
migration completes, adding all ram statistics

Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent 8e21cd32

hmp.c

+2 −0
Original line number Diff line number Diff line
@@ -145,6 +145,8 @@ void hmp_info_migrate(Monitor *mon) 
                       info->ram->remaining >> 10);

        monitor_printf(mon, "total ram: %" PRIu64 " kbytes\n",

                       info->ram->total >> 10);

        monitor_printf(mon, "total time: %" PRIu64 " milliseconds\n",

                       info->ram->total_time);

    }



    if (info->has_disk) {

migration.c

+11 −0
Original line number Diff line number Diff line
@@ -131,6 +131,8 @@ MigrationInfo *qmp_query_migrate(Error **errp) 
        info->ram->transferred = ram_bytes_transferred();

        info->ram->remaining = ram_bytes_remaining();

        info->ram->total = ram_bytes_total();

        info->ram->total_time = qemu_get_clock_ms(rt_clock)

            - s->total_time;



        if (blk_mig_active()) {

            info->has_disk = true;
@@ -143,6 +145,13 @@ MigrationInfo *qmp_query_migrate(Error **errp) 
    case MIG_STATE_COMPLETED:

        info->has_status = true;

        info->status = g_strdup("completed");



        info->has_ram = true;

        info->ram = g_malloc0(sizeof(*info->ram));

        info->ram->transferred = ram_bytes_transferred();

        info->ram->remaining = 0;

        info->ram->total = ram_bytes_total();

        info->ram->total_time = s->total_time;

        break;

    case MIG_STATE_ERROR:

        info->has_status = true;
@@ -260,6 +269,7 @@ static void migrate_fd_put_ready(void *opaque) 
        } else {

            migrate_fd_completed(s);

        }

        s->total_time = qemu_get_clock_ms(rt_clock) - s->total_time;

        if (s->state != MIG_STATE_COMPLETED) {

            if (old_vm_running) {

                vm_start();
@@ -372,6 +382,7 @@ static MigrationState *migrate_init(const MigrationParams *params) 


    s->bandwidth_limit = bandwidth_limit;

    s->state = MIG_STATE_SETUP;

    s->total_time = qemu_get_clock_ms(rt_clock);



    return s;

}

migration.h

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ struct MigrationState 
    int (*write)(MigrationState *s, const void *buff, size_t size);

    void *opaque;

    MigrationParams params;

    int64_t total_time;

};



void process_incoming_migration(QEMUFile *f);

qapi-schema.json

+9 −3
Original line number Diff line number Diff line
@@ -260,10 +260,15 @@ 
#

# @total: total amount of bytes involved in the migration process

#

# @total_time: tota0l amount of ms since migration started.  If

#        migration has ended, it returns the total migration

#        time. (since 1.2)

#

# Since: 0.14.0.

##

{ 'type': 'MigrationStats',

  'data': {'transferred': 'int', 'remaining': 'int', 'total': 'int' } }

  'data': {'transferred': 'int', 'remaining': 'int', 'total': 'int' ,

           'total_time': 'int' } }



##

# @MigrationInfo
@@ -275,8 +280,9 @@ 
#          'cancelled'. If this field is not returned, no migration process

#          has been initiated

#

# @ram: #optional @MigrationStats containing detailed migration status,

#       only returned if status is 'active'

# @ram: #optional @MigrationStats containing detailed migration

#       status, only returned if status is 'active' or

#       'completed'. 'comppleted' (since 1.2)

#

# @disk: #optional @MigrationStats containing detailed disk migration

#        status, only returned if status is 'active' and it is a block