[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/14] migration: Recover block devices if failure in
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 12/14] migration: Recover block devices if failure in device state |
Date: |
Tue, 6 Feb 2018 15:49:34 +0000 |
From: "Dr. David Alan Gilbert" <address@hidden>
In e91d895 I added the new pause-before-switchover mechanism
to allow migration completion to be delayed; this changes the
last state prior to completion to MIGRATE_STATUS_DEVICE rather
than MIGRATE_STATUS_ACTIVE.
Fix the failure path in migration_completion to recover the block
devices if it fails in MIGRATE_STATUS_DEVICE, not just the
MIGRATE_STATUS_ACTIVE that it previously had.
This corresponds to rh bz:
https://bugzilla.redhat.com/show_bug.cgi?id=1538494
whose symptom is an occasional source crash on a failed migration.
Fixes: e91d8951d59d483f085f
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
migration/migration.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/migration/migration.c b/migration/migration.c
index 44cbfb0ddd..0fdb2e410d 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2122,7 +2122,8 @@ fail_invalidate:
/* If not doing postcopy, vm_start() will be called: let's regain
* control on images.
*/
- if (s->state == MIGRATION_STATUS_ACTIVE) {
+ if (s->state == MIGRATION_STATUS_ACTIVE ||
+ s->state == MIGRATION_STATUS_DEVICE) {
Error *local_err = NULL;
qemu_mutex_lock_iothread();
--
2.14.3
- [Qemu-devel] [PULL 02/14] migration: Route errors down through migration_channel_connect, (continued)
- [Qemu-devel] [PULL 02/14] migration: Route errors down through migration_channel_connect, Dr. David Alan Gilbert (git), 2018/02/06
- [Qemu-devel] [PULL 03/14] migration/savevm.c: set MAX_VM_CMD_PACKAGED_SIZE to 1ul << 32, Dr. David Alan Gilbert (git), 2018/02/06
- [Qemu-devel] [PULL 04/14] migration: use s->threshold_size inside migration_update_counters, Dr. David Alan Gilbert (git), 2018/02/06
- [Qemu-devel] [PULL 05/14] migration: Drop current address parameter from save_zero_page(), Dr. David Alan Gilbert (git), 2018/02/06
- [Qemu-devel] [PULL 06/14] tests: Remove deprecated migration tests commands, Dr. David Alan Gilbert (git), 2018/02/06
- [Qemu-devel] [PULL 07/14] tests: Consolidate accelerators declaration, Dr. David Alan Gilbert (git), 2018/02/06
- [Qemu-devel] [PULL 08/14] tests: Use consistent names for migration, Dr. David Alan Gilbert (git), 2018/02/06
- [Qemu-devel] [PULL 09/14] tests: Add deprecated commands migration test, Dr. David Alan Gilbert (git), 2018/02/06
- [Qemu-devel] [PULL 10/14] tests: Create migrate-start-postcopy command, Dr. David Alan Gilbert (git), 2018/02/06
- [Qemu-devel] [PULL 11/14] tests: Adjust sleeps for migration test, Dr. David Alan Gilbert (git), 2018/02/06
- [Qemu-devel] [PULL 12/14] migration: Recover block devices if failure in device state,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 13/14] migration: Don't leak IO channels, Dr. David Alan Gilbert (git), 2018/02/06
- [Qemu-devel] [PULL 14/14] migration: incoming postcopy advise sanity checks, Dr. David Alan Gilbert (git), 2018/02/06
- Re: [Qemu-devel] [PULL 00/14] migration queue, Peter Maydell, 2018/02/07