[Qemu-devel] [PULL 31/57] MIGRATION_STATUS_POSTCOPY_ACTIVE: Add new migration state
From: "Dr. David Alan Gilbert" 'MIGRATION_STATUS_POSTCOPY_ACTIVE' is entered after migrate_start_postcopy 'migration_in_postcopy' is provided for other sections to know if they're in postcopy. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: David Gibson Reviewed-by: Eric Blake Reviewed-by: Juan Quintela Reviewed-by: Amit Shah Signed-off-by: Juan Quintela --- include/migration/migration.h | 2 ++ migration/migration.c | 47 +-- qapi-schema.json | 4 +++- trace-events | 1 + 4 files changed, 51 insertions(+), 3 deletions(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index 217..219032d 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -170,6 +170,8 @@ MigrationState *migrate_init(const MigrationParams *params); bool migration_in_setup(MigrationState *); bool migration_has_finished(MigrationState *); bool migration_has_failed(MigrationState *); +/* True if outgoing migration has entered postcopy phase */ +bool migration_in_postcopy(MigrationState *); MigrationState *migrate_get_current(void); void migrate_compress_threads_create(void); diff --git a/migration/migration.c b/migration/migration.c index d6f6f4c..76aa524 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -462,6 +462,7 @@ static bool migration_is_setup_or_active(int state) { switch (state) { case MIGRATION_STATUS_ACTIVE: +case MIGRATION_STATUS_POSTCOPY_ACTIVE: case MIGRATION_STATUS_SETUP: return true; @@ -537,6 +538,39 @@ MigrationInfo *qmp_query_migrate(Error **errp) get_xbzrle_cache_stats(info); break; +case MIGRATION_STATUS_POSTCOPY_ACTIVE: +/* Mostly the same as active; TODO add some postcopy stats */ +info->has_status = true; +info->has_total_time = true; +info->total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME) +- 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)); +info->ram->transferred = ram_bytes_transferred(); +info->ram->remaining = ram_bytes_remaining(); +info->ram->total = ram_bytes_total(); +info->ram->duplicate = dup_mig_pages_transferred(); +info->ram->skipped = skipped_mig_pages_transferred(); +info->ram->normal = norm_mig_pages_transferred(); +info->ram->normal_bytes = norm_mig_bytes_transferred(); +info->ram->dirty_pages_rate = s->dirty_pages_rate; +info->ram->mbps = s->mbps; + +if (blk_mig_active()) { +info->has_disk = true; +info->disk = g_malloc0(sizeof(*info->disk)); +info->disk->transferred = blk_mig_bytes_transferred(); +info->disk->remaining = blk_mig_bytes_remaining(); +info->disk->total = blk_mig_bytes_total(); +} + +get_xbzrle_cache_stats(info); +break; case MIGRATION_STATUS_COMPLETED: get_xbzrle_cache_stats(info); @@ -718,7 +752,8 @@ static void migrate_fd_cleanup(void *opaque) s->file = NULL; } -assert(s->state != MIGRATION_STATUS_ACTIVE); +assert((s->state != MIGRATION_STATUS_ACTIVE) && + (s->state != MIGRATION_STATUS_POSTCOPY_ACTIVE)); if (s->state == MIGRATION_STATUS_CANCELLING) { migrate_set_state(s, MIGRATION_STATUS_CANCELLING, @@ -793,6 +828,11 @@ bool migration_has_failed(MigrationState *s) s->state == MIGRATION_STATUS_FAILED); } +bool migration_in_postcopy(MigrationState *s) +{ +return (s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE); +} + MigrationState *migrate_init(const MigrationParams *params) { MigrationState *s = migrate_get_current(); @@ -1307,7 +1347,10 @@ static void *migration_thread(void *opaque) s->setup_time = qemu_clock_get_ms(QEMU_CLOCK_HOST) - setup_start; migrate_set_state(s, MIGRATION_STATUS_SETUP, MIGRATION_STATUS_ACTIVE); -while (s->state == MIGRATION_STATUS_ACTIVE) { +trace_migration_thread_setup_complete(); + +while (s->state == MIGRATION_STATUS_ACTIVE || + s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE) { int64_t current_time; uint64_t pending_size; diff --git a/qapi-schema.json b/qapi-schema.json index d25df93..8c3a42a 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -430,6 +430,8 @@ # # @active: in the process of doing migration. # +# @postcopy-active: like active, but now in postcopy mode. (since 2.5) +# # @completed: migration is finished. # # @failed: some error occurred during migration process. @@ -439,7 +441,7 @@ ## { 'enum': 'MigrationStatus', 'data': [ 'none', 'setup', 'cancelling', 'cancelled', -'active', 'completed', 'failed' ] } +'ac
[Qemu-devel] [PULL 31/57] MIGRATION_STATUS_POSTCOPY_ACTIVE: Add new migration state
From: "Dr. David Alan Gilbert" 'MIGRATION_STATUS_POSTCOPY_ACTIVE' is entered after migrate_start_postcopy 'migration_in_postcopy' is provided for other sections to know if they're in postcopy. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: David Gibson Reviewed-by: Eric Blake Reviewed-by: Juan Quintela Reviewed-by: Amit Shah Signed-off-by: Juan Quintela --- include/migration/migration.h | 2 ++ migration/migration.c | 47 +-- qapi-schema.json | 4 +++- trace-events | 1 + 4 files changed, 51 insertions(+), 3 deletions(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index 217..219032d 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -170,6 +170,8 @@ MigrationState *migrate_init(const MigrationParams *params); bool migration_in_setup(MigrationState *); bool migration_has_finished(MigrationState *); bool migration_has_failed(MigrationState *); +/* True if outgoing migration has entered postcopy phase */ +bool migration_in_postcopy(MigrationState *); MigrationState *migrate_get_current(void); void migrate_compress_threads_create(void); diff --git a/migration/migration.c b/migration/migration.c index 85e68bc..2acd0e6 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -462,6 +462,7 @@ static bool migration_is_setup_or_active(int state) { switch (state) { case MIGRATION_STATUS_ACTIVE: +case MIGRATION_STATUS_POSTCOPY_ACTIVE: case MIGRATION_STATUS_SETUP: return true; @@ -537,6 +538,39 @@ MigrationInfo *qmp_query_migrate(Error **errp) get_xbzrle_cache_stats(info); break; +case MIGRATION_STATUS_POSTCOPY_ACTIVE: +/* Mostly the same as active; TODO add some postcopy stats */ +info->has_status = true; +info->has_total_time = true; +info->total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME) +- 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)); +info->ram->transferred = ram_bytes_transferred(); +info->ram->remaining = ram_bytes_remaining(); +info->ram->total = ram_bytes_total(); +info->ram->duplicate = dup_mig_pages_transferred(); +info->ram->skipped = skipped_mig_pages_transferred(); +info->ram->normal = norm_mig_pages_transferred(); +info->ram->normal_bytes = norm_mig_bytes_transferred(); +info->ram->dirty_pages_rate = s->dirty_pages_rate; +info->ram->mbps = s->mbps; + +if (blk_mig_active()) { +info->has_disk = true; +info->disk = g_malloc0(sizeof(*info->disk)); +info->disk->transferred = blk_mig_bytes_transferred(); +info->disk->remaining = blk_mig_bytes_remaining(); +info->disk->total = blk_mig_bytes_total(); +} + +get_xbzrle_cache_stats(info); +break; case MIGRATION_STATUS_COMPLETED: get_xbzrle_cache_stats(info); @@ -718,7 +752,8 @@ static void migrate_fd_cleanup(void *opaque) s->file = NULL; } -assert(s->state != MIGRATION_STATUS_ACTIVE); +assert((s->state != MIGRATION_STATUS_ACTIVE) && + (s->state != MIGRATION_STATUS_POSTCOPY_ACTIVE)); if (s->state == MIGRATION_STATUS_CANCELLING) { migrate_set_state(s, MIGRATION_STATUS_CANCELLING, @@ -793,6 +828,11 @@ bool migration_has_failed(MigrationState *s) s->state == MIGRATION_STATUS_FAILED); } +bool migration_in_postcopy(MigrationState *s) +{ +return (s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE); +} + MigrationState *migrate_init(const MigrationParams *params) { MigrationState *s = migrate_get_current(); @@ -1307,7 +1347,10 @@ static void *migration_thread(void *opaque) s->setup_time = qemu_clock_get_ms(QEMU_CLOCK_HOST) - setup_start; migrate_set_state(s, MIGRATION_STATUS_SETUP, MIGRATION_STATUS_ACTIVE); -while (s->state == MIGRATION_STATUS_ACTIVE) { +trace_migration_thread_setup_complete(); + +while (s->state == MIGRATION_STATUS_ACTIVE || + s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE) { int64_t current_time; uint64_t pending_size; diff --git a/qapi-schema.json b/qapi-schema.json index d25df93..8c3a42a 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -430,6 +430,8 @@ # # @active: in the process of doing migration. # +# @postcopy-active: like active, but now in postcopy mode. (since 2.5) +# # @completed: migration is finished. # # @failed: some error occurred during migration process. @@ -439,7 +441,7 @@ ## { 'enum': 'MigrationStatus', 'data': [ 'none', 'setup', 'cancelling', 'cancelled', -'active', 'completed', 'failed' ] } +'ac