david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

migration: Fix cancel state

Browse Source 
During a cancelled migration there's a race where the fd can
go into an error state before we get back around the migration loop
and migration_detect_error transitions from cancelling->failed.

Check for cancelled/cancelling and don't change the state.

Red Hat bug: https://bugzilla.redhat.com/show_bug.cgi?id=1608649

Fixes: b23c2ade250
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20190219195928.12289-1-dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Dr. David Alan Gilbert 2019-02-19 19:59:28 +00:00
parent b5b6b2b912
commit c3c5eae6ac
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
migration/migration.c
View File

@ -2911,6 +2911,13 @@ static MigThrError postcopy_pause(MigrationState *s)
static MigThrError migration_detect_error(MigrationState *s) static MigThrError migration_detect_error(MigrationState *s)
{ {
int ret; int ret;
int state = s->state;
if (state == MIGRATION_STATUS_CANCELLING ||
state == MIGRATION_STATUS_CANCELLED) {
/* End the migration, but don't set the state to failed */
return MIG_THR_ERR_FATAL;
}
/* Try to detect any file errors */ /* Try to detect any file errors */
ret = qemu_file_get_error(s->to_dst_file); ret = qemu_file_get_error(s->to_dst_file);
@ -2920,7 +2927,7 @@ static MigThrError migration_detect_error(MigrationState *s)
return MIG_THR_ERR_NONE; return MIG_THR_ERR_NONE;
} }
if (s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE && ret == -EIO) { if (state == MIGRATION_STATUS_POSTCOPY_ACTIVE && ret == -EIO) {
/* /*
* For postcopy, we allow the network to be down for a * For postcopy, we allow the network to be down for a
* while. After that, it can be continued by a * while. After that, it can be continued by a
@ -2932,7 +2939,7 @@ static MigThrError migration_detect_error(MigrationState *s)
* For precopy (or postcopy with error outside IO), we fail * For precopy (or postcopy with error outside IO), we fail
* with no time. * with no time.
*/ */
migrate_set_state(&s->state, s->state, MIGRATION_STATUS_FAILED); migrate_set_state(&s->state, state, MIGRATION_STATUS_FAILED);
trace_migration_thread_file_err(); trace_migration_thread_file_err();
/* Time to stop the migration, now. */ /* Time to stop the migration, now. */