|
 |
23265d |
From c92e3fa956308c0b8be42a412b6f6ea2b9ff27ce Mon Sep 17 00:00:00 2001
|
|
|
23265d |
Message-Id: <c92e3fa956308c0b8be42a412b6f6ea2b9ff27ce@dist-git>
|
|
|
23265d |
From: Jiri Denemark <jdenemar@redhat.com>
|
|
|
23265d |
Date: Fri, 19 Jan 2018 13:51:51 +0100
|
|
|
23265d |
Subject: [PATCH] RHEL: qemu: Report full stats for completed migration
|
|
|
23265d |
|
|
|
23265d |
RHEL-only: caused by improper adjustment of a backported patch
|
|
|
23265d |
|
|
|
23265d |
When backporting patches (specifically upstream commit 3f2d6d829e, which
|
|
|
23265d |
was backported to 7.4.z as commit 547c0e17e6) for BZ 1530130 I
|
|
|
23265d |
intentionally skipped several refactoring commits because they were not
|
|
|
23265d |
trivial and resolving conflicts could cause more problems than skipping
|
|
|
23265d |
them. The commits were done upstream to support reporting statistics
|
|
|
23265d |
from NBD migration.
|
|
|
23265d |
|
|
|
23265d |
The refactors moved qemuMigrationFetchJobStatus (hidden in
|
|
|
23265d |
qemuMigrationUpdateJobStatus in RHEL-7.4) out of
|
|
|
23265d |
qemuMigrationCheckJobStatus. Because of this, the upstream version of
|
|
|
23265d |
qemuMigrationCheckJobStatus didn't have to do anything special for the
|
|
|
23265d |
QEMU_DOMAIN_JOB_STATUS_COMPLETED switch branch. But downstream called
|
|
|
23265d |
qemuMigrationUpdateJobStatus in this branch and thus
|
|
|
23265d |
QEMU_DOMAIN_JOB_STATUS_COMPLETED should have been replaced with
|
|
|
23265d |
QEMU_DOMAIN_JOB_STATUS_QEMU_COMPLETED to make sure the migration
|
|
|
23265d |
statistics are properly fetched from QEMU once migration completes.
|
|
|
23265d |
|
|
|
23265d |
https://bugzilla.redhat.com/show_bug.cgi?id=1530130
|
|
|
23265d |
|
|
|
23265d |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
23265d |
---
|
|
|
23265d |
src/qemu/qemu_migration.c | 4 ++--
|
|
|
23265d |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
23265d |
|
|
|
23265d |
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
|
|
|
23265d |
index 2b1e8dd9fd..ab5398f5ea 100644
|
|
|
23265d |
--- a/src/qemu/qemu_migration.c
|
|
|
23265d |
+++ b/src/qemu/qemu_migration.c
|
|
|
23265d |
@@ -1452,7 +1452,7 @@ qemuMigrationCheckJobStatus(virQEMUDriverPtr driver,
|
|
|
23265d |
qemuMigrationJobName(vm), _("canceled by client"));
|
|
|
23265d |
return -1;
|
|
|
23265d |
|
|
|
23265d |
- case QEMU_DOMAIN_JOB_STATUS_COMPLETED:
|
|
|
23265d |
+ case QEMU_DOMAIN_JOB_STATUS_QEMU_COMPLETED:
|
|
|
23265d |
/* Fetch statistics of a completed migration */
|
|
|
23265d |
if (events && updateJobStats &&
|
|
|
23265d |
qemuMigrationUpdateJobStatus(driver, vm, asyncJob) < 0)
|
|
|
23265d |
@@ -1461,7 +1461,7 @@ qemuMigrationCheckJobStatus(virQEMUDriverPtr driver,
|
|
|
23265d |
|
|
|
23265d |
case QEMU_DOMAIN_JOB_STATUS_ACTIVE:
|
|
|
23265d |
case QEMU_DOMAIN_JOB_STATUS_MIGRATING:
|
|
|
23265d |
- case QEMU_DOMAIN_JOB_STATUS_QEMU_COMPLETED:
|
|
|
23265d |
+ case QEMU_DOMAIN_JOB_STATUS_COMPLETED:
|
|
|
23265d |
case QEMU_DOMAIN_JOB_STATUS_POSTCOPY:
|
|
|
23265d |
break;
|
|
|
23265d |
}
|
|
|
23265d |
--
|
|
|
23265d |
2.16.0
|
|
|
23265d |
|