Commit d3bf5418 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Amit Shah
Browse files

Postcopy: Add stats on page requests 



On the source, add a count of page requests received from the
destination.

Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarDenis V. Lunev <den@openvz.org>
Message-id: 1465816605-29488-4-git-send-email-dgilbert@redhat.com
Message-Id: <1465816605-29488-4-git-send-email-dgilbert@redhat.com>
Signed-off-by: default avatarAmit Shah <amit.shah@redhat.com>
parent a22463a5

hmp.c

+4 −0
Original line number Diff line number Diff line
@@ -217,6 +217,10 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict) 
            monitor_printf(mon, "dirty pages rate: %" PRIu64 " pages\n",

                           info->ram->dirty_pages_rate);

        }

        if (info->ram->postcopy_requests) {

            monitor_printf(mon, "postcopy request count: %" PRIu64 "\n",

                           info->ram->postcopy_requests);

        }

    }



    if (info->has_disk) {

include/migration/migration.h

+2 −0
Original line number Diff line number Diff line
@@ -160,6 +160,8 @@ struct MigrationState 
    int64_t xbzrle_cache_size;

    int64_t setup_time;

    int64_t dirty_sync_count;

    /* Count of requests incoming from destination */

    int64_t postcopy_requests;



    /* Flag set once the migration has been asked to enter postcopy */

    bool start_postcopy;

migration/migration.c

+2 −0
Original line number Diff line number Diff line
@@ -614,6 +614,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s) 
    info->ram->normal_bytes = norm_mig_bytes_transferred();

    info->ram->mbps = s->mbps;

    info->ram->dirty_sync_count = s->dirty_sync_count;

    info->ram->postcopy_requests = s->postcopy_requests;



    if (s->state != MIGRATION_STATUS_COMPLETED) {

        info->ram->remaining = ram_bytes_remaining();
@@ -991,6 +992,7 @@ MigrationState *migrate_init(const MigrationParams *params) 
    s->dirty_sync_count = 0;

    s->start_postcopy = false;

    s->postcopy_after_devices = false;

    s->postcopy_requests = 0;

    s->migration_thread_running = false;

    s->last_req_rb = NULL;

    error_free(s->error);

migration/ram.c

+1 −0
Original line number Diff line number Diff line
@@ -1169,6 +1169,7 @@ int ram_save_queue_pages(MigrationState *ms, const char *rbname, 
{

    RAMBlock *ramblock;



    ms->postcopy_requests++;

    rcu_read_lock();

    if (!rbname) {

        /* Reuse last RAMBlock */

qapi-schema.json

+5 −1
Original line number Diff line number Diff line
@@ -382,13 +382,17 @@ 
#

# @dirty-sync-count: number of times that dirty ram was synchronized (since 2.1)

#

# @postcopy-requests: The number of page requests received from the destination

#        (since 2.7)

#

# Since: 0.14.0

##

{ 'struct': 'MigrationStats',

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

           'duplicate': 'int', 'skipped': 'int', 'normal': 'int',

           'normal-bytes': 'int', 'dirty-pages-rate' : 'int',

           'mbps' : 'number', 'dirty-sync-count' : 'int' } }

           'mbps' : 'number', 'dirty-sync-count' : 'int',

           'postcopy-requests' : 'int' } }



##

# @XBZRLECacheStats