|
 |
23265d |
From 59dfc370693ee7631f7b538660cfd30f213b0a86 Mon Sep 17 00:00:00 2001
|
|
|
23265d |
Message-Id: <59dfc370693ee7631f7b538660cfd30f213b0a86@dist-git>
|
|
|
23265d |
From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
|
|
|
23265d |
Date: Fri, 1 Sep 2017 09:49:28 +0300
|
|
|
23265d |
Subject: [PATCH] qemu: introduce migrating job status
|
|
|
23265d |
|
|
|
23265d |
Instead of checking stat.status let's set status to migrating
|
|
|
23265d |
as soon as migrate command is send (waiting for completion
|
|
|
23265d |
is a good place too).
|
|
|
23265d |
|
|
|
23265d |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
23265d |
(cherry picked from commit 5a274d4fdc0015909fa95e6667922bb249a95bd5)
|
|
|
23265d |
|
|
|
23265d |
https://bugzilla.redhat.com/show_bug.cgi?id=1530130
|
|
|
23265d |
|
|
|
23265d |
Conflicts:
|
|
|
23265d |
src/qemu/qemu_migration.c
|
|
|
23265d |
- commit e87d4b9e2f is not backported
|
|
|
23265d |
|
|
|
23265d |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
23265d |
---
|
|
|
23265d |
src/qemu/qemu_domain.c | 1 +
|
|
|
23265d |
src/qemu/qemu_domain.h | 1 +
|
|
|
23265d |
src/qemu/qemu_driver.c | 4 +++-
|
|
|
23265d |
src/qemu/qemu_migration.c | 9 +++++++--
|
|
|
23265d |
4 files changed, 12 insertions(+), 3 deletions(-)
|
|
|
23265d |
|
|
|
23265d |
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
|
|
|
23265d |
index 4b1ead7d0a..e81d682c00 100644
|
|
|
23265d |
--- a/src/qemu/qemu_domain.c
|
|
|
23265d |
+++ b/src/qemu/qemu_domain.c
|
|
|
23265d |
@@ -397,6 +397,7 @@ qemuDomainJobStatusToType(qemuDomainJobStatus status)
|
|
|
23265d |
break;
|
|
|
23265d |
|
|
|
23265d |
case QEMU_DOMAIN_JOB_STATUS_ACTIVE:
|
|
|
23265d |
+ case QEMU_DOMAIN_JOB_STATUS_MIGRATING:
|
|
|
23265d |
case QEMU_DOMAIN_JOB_STATUS_POSTCOPY:
|
|
|
23265d |
return VIR_DOMAIN_JOB_UNBOUNDED;
|
|
|
23265d |
|
|
|
23265d |
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
|
|
|
23265d |
index c8b3873b9f..0cf54d99ae 100644
|
|
|
23265d |
--- a/src/qemu/qemu_domain.h
|
|
|
23265d |
+++ b/src/qemu/qemu_domain.h
|
|
|
23265d |
@@ -102,6 +102,7 @@ VIR_ENUM_DECL(qemuDomainAsyncJob)
|
|
|
23265d |
typedef enum {
|
|
|
23265d |
QEMU_DOMAIN_JOB_STATUS_NONE = 0,
|
|
|
23265d |
QEMU_DOMAIN_JOB_STATUS_ACTIVE,
|
|
|
23265d |
+ QEMU_DOMAIN_JOB_STATUS_MIGRATING,
|
|
|
23265d |
QEMU_DOMAIN_JOB_STATUS_POSTCOPY,
|
|
|
23265d |
QEMU_DOMAIN_JOB_STATUS_COMPLETED,
|
|
|
23265d |
QEMU_DOMAIN_JOB_STATUS_FAILED,
|
|
|
23265d |
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
|
23265d |
index 8972897a28..931f3d344d 100644
|
|
|
23265d |
--- a/src/qemu/qemu_driver.c
|
|
|
23265d |
+++ b/src/qemu/qemu_driver.c
|
|
|
23265d |
@@ -12934,7 +12934,8 @@ qemuDomainGetJobStatsInternal(virQEMUDriverPtr driver,
|
|
|
23265d |
fetch = false;
|
|
|
23265d |
|
|
|
23265d |
/* Do not ask QEMU if migration is not even running yet */
|
|
|
23265d |
- if (!priv->job.current || !priv->job.current->stats.status)
|
|
|
23265d |
+ if (!priv->job.current ||
|
|
|
23265d |
+ priv->job.current->status == QEMU_DOMAIN_JOB_STATUS_ACTIVE)
|
|
|
23265d |
fetch = false;
|
|
|
23265d |
|
|
|
23265d |
if (fetch) {
|
|
|
23265d |
@@ -12970,6 +12971,7 @@ qemuDomainGetJobStatsInternal(virQEMUDriverPtr driver,
|
|
|
23265d |
*jobInfo = *info;
|
|
|
23265d |
|
|
|
23265d |
if (jobInfo->status == QEMU_DOMAIN_JOB_STATUS_ACTIVE ||
|
|
|
23265d |
+ jobInfo->status == QEMU_DOMAIN_JOB_STATUS_MIGRATING ||
|
|
|
23265d |
jobInfo->status == QEMU_DOMAIN_JOB_STATUS_POSTCOPY) {
|
|
|
23265d |
if (fetch)
|
|
|
23265d |
ret = qemuMigrationFetchJobStatus(driver, vm, QEMU_ASYNC_JOB_NONE,
|
|
|
23265d |
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
|
|
|
23265d |
index 9f7aad6680..c8cd7ebfa3 100644
|
|
|
23265d |
--- a/src/qemu/qemu_migration.c
|
|
|
23265d |
+++ b/src/qemu/qemu_migration.c
|
|
|
23265d |
@@ -1460,6 +1460,7 @@ qemuMigrationCheckJobStatus(virQEMUDriverPtr driver,
|
|
|
23265d |
break;
|
|
|
23265d |
|
|
|
23265d |
case QEMU_DOMAIN_JOB_STATUS_ACTIVE:
|
|
|
23265d |
+ case QEMU_DOMAIN_JOB_STATUS_MIGRATING:
|
|
|
23265d |
case QEMU_DOMAIN_JOB_STATUS_POSTCOPY:
|
|
|
23265d |
break;
|
|
|
23265d |
}
|
|
|
23265d |
@@ -1532,7 +1533,8 @@ qemuMigrationCompleted(virQEMUDriverPtr driver,
|
|
|
23265d |
return 0;
|
|
|
23265d |
|
|
|
23265d |
error:
|
|
|
23265d |
- if (jobInfo->status == QEMU_DOMAIN_JOB_STATUS_ACTIVE ||
|
|
|
23265d |
+ /* state can not be active at this point */
|
|
|
23265d |
+ if (jobInfo->status == QEMU_DOMAIN_JOB_STATUS_MIGRATING ||
|
|
|
23265d |
jobInfo->status == QEMU_DOMAIN_JOB_STATUS_POSTCOPY) {
|
|
|
23265d |
/* The migration was aborted by us rather than QEMU itself. */
|
|
|
23265d |
jobInfo->status = QEMU_DOMAIN_JOB_STATUS_FAILED;
|
|
|
23265d |
@@ -1563,6 +1565,8 @@ qemuMigrationWaitForCompletion(virQEMUDriverPtr driver,
|
|
|
23265d |
|
|
|
23265d |
flags |= QEMU_MIGRATION_COMPLETED_UPDATE_STATS;
|
|
|
23265d |
|
|
|
23265d |
+ jobInfo->status = QEMU_DOMAIN_JOB_STATUS_MIGRATING;
|
|
|
23265d |
+
|
|
|
23265d |
while ((rv = qemuMigrationCompleted(driver, vm, asyncJob,
|
|
|
23265d |
dconn, flags)) != 1) {
|
|
|
23265d |
if (rv < 0)
|
|
|
23265d |
@@ -3879,7 +3883,8 @@ qemuMigrationRun(virQEMUDriverPtr driver,
|
|
|
23265d |
ignore_value(virTimeMillisNow(&priv->job.completed->sent));
|
|
|
23265d |
}
|
|
|
23265d |
|
|
|
23265d |
- if (priv->job.current->status == QEMU_DOMAIN_JOB_STATUS_ACTIVE)
|
|
|
23265d |
+ if (priv->job.current->status == QEMU_DOMAIN_JOB_STATUS_ACTIVE ||
|
|
|
23265d |
+ priv->job.current->status == QEMU_DOMAIN_JOB_STATUS_MIGRATING)
|
|
|
23265d |
priv->job.current->status = QEMU_DOMAIN_JOB_STATUS_FAILED;
|
|
|
23265d |
|
|
|
23265d |
cookieFlags |= QEMU_MIGRATION_COOKIE_NETWORK |
|
|
|
23265d |
--
|
|
|
23265d |
2.15.1
|
|
|
23265d |
|