|
 |
6d3351 |
From 81d8546556f74d0052cbe2a2c3287bc9d796bf32 Mon Sep 17 00:00:00 2001
|
|
|
6d3351 |
Message-Id: <81d8546556f74d0052cbe2a2c3287bc9d796bf32@dist-git>
|
|
|
6d3351 |
From: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6d3351 |
Date: Thu, 27 Apr 2017 14:08:40 +0200
|
|
|
6d3351 |
Subject: [PATCH] qemu: Properly reset non-p2p migration
|
|
|
6d3351 |
|
|
|
6d3351 |
While peer-to-peer migration enters the Confirm phase even if the
|
|
|
6d3351 |
Perform phase fails, the client which initiated a non-p2p migration will
|
|
|
6d3351 |
never call virDomainMigrateConfirm* API if the Perform phase failed.
|
|
|
6d3351 |
Thus we need to explicitly reset migration before reporting a failure
|
|
|
6d3351 |
from the Perform phase API.
|
|
|
6d3351 |
|
|
|
6d3351 |
https://bugzilla.redhat.com/show_bug.cgi?id=1425003
|
|
|
6d3351 |
|
|
|
6d3351 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6d3351 |
(cherry picked from commit eeb2feb9fbb66ea9026edc6451018fb3b94ffa58)
|
|
|
6d3351 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6d3351 |
---
|
|
|
6d3351 |
src/qemu/qemu_migration.c | 7 +++++--
|
|
|
6d3351 |
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
6d3351 |
|
|
|
6d3351 |
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
|
|
|
6d3351 |
index 8c6d1385e..8cbad894c 100644
|
|
|
6d3351 |
--- a/src/qemu/qemu_migration.c
|
|
|
6d3351 |
+++ b/src/qemu/qemu_migration.c
|
|
|
6d3351 |
@@ -4902,10 +4902,13 @@ qemuMigrationPerformPhase(virQEMUDriverPtr driver,
|
|
|
6d3351 |
goto endjob;
|
|
|
6d3351 |
|
|
|
6d3351 |
endjob:
|
|
|
6d3351 |
- if (ret < 0)
|
|
|
6d3351 |
+ if (ret < 0) {
|
|
|
6d3351 |
+ qemuMigrationReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT);
|
|
|
6d3351 |
qemuMigrationJobFinish(driver, vm);
|
|
|
6d3351 |
- else
|
|
|
6d3351 |
+ } else {
|
|
|
6d3351 |
qemuMigrationJobContinue(vm);
|
|
|
6d3351 |
+ }
|
|
|
6d3351 |
+
|
|
|
6d3351 |
if (!virDomainObjIsActive(vm))
|
|
|
6d3351 |
qemuDomainRemoveInactive(driver, vm);
|
|
|
6d3351 |
|
|
|
6d3351 |
--
|
|
|
6d3351 |
2.12.2
|
|
|
6d3351 |
|