Jobs that are supposed to remain active even when libvirt daemon
restarts were reported as started at the time the daemon was restarted.
This is not very helpful, we should restore the original timestamp.
Signed-off-by: Jiri Denemark <jdenemar@xxxxxxxxxx>
---
Notes:
Version 2:
- use current time as a fallback
src/qemu/qemu_domainjob.c | 21 ++++++++++++++-----
src/qemu/qemu_domainjob.h | 1 +
src/qemu/qemu_process.c | 4 +++-
.../migration-in-params-in.xml | 2 +-
.../migration-out-nbd-bitmaps-in.xml | 2 +-
.../migration-out-nbd-out.xml | 2 +-
.../migration-out-nbd-tls-out.xml | 2 +-
.../migration-out-params-in.xml | 2 +-
8 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c
index f85429a7ce..e76eb7f2cf 100644
--- a/src/qemu/qemu_domainjob.c
+++ b/src/qemu/qemu_domainjob.c
@@ -235,6 +235,7 @@ qemuDomainObjPreserveJob(virDomainObj *obj,
job->owner = priv->job.owner;
job->asyncJob = priv->job.asyncJob;
job->asyncOwner = priv->job.asyncOwner;
+ job->asyncStarted = priv->job.asyncStarted;
job->phase = priv->job.phase;
job->privateData = g_steal_pointer(&priv->job.privateData);
job->apiFlags = priv->job.apiFlags;
@@ -254,6 +255,7 @@ void
qemuDomainObjRestoreAsyncJob(virDomainObj *vm,
virDomainAsyncJob asyncJob,
int phase,
+ unsigned long long started,
virDomainJobOperation operation,
qemuDomainJobStatsType statsType,
virDomainJobStatus status,
@@ -261,18 +263,18 @@ qemuDomainObjRestoreAsyncJob(virDomainObj *vm,
{
qemuDomainObjPrivate *priv = vm->privateData;
qemuDomainJobObj *job = &priv->job;
- unsigned long long now;
VIR_DEBUG("Restoring %s async job for domain %s",
virDomainAsyncJobTypeToString(asyncJob), vm->def->name);
- ignore_value(virTimeMillisNow(&now));
+ if (started == 0)
+ ignore_value(virTimeMillisNow(&started));
job->jobsQueued++;
job->asyncJob = asyncJob;
job->phase = phase;
job->asyncOwnerAPI = g_strdup(virThreadJobGet());
- job->asyncStarted = now;
+ job->asyncStarted = started;
qemuDomainObjSetAsyncJobMask(vm, allowedJobs);
@@ -280,7 +282,7 @@ qemuDomainObjRestoreAsyncJob(virDomainObj *vm,
qemuDomainJobSetStatsType(priv->job.current, statsType);
job->current->operation = operation;
job->current->status = status;
- job->current->started = now;
+ job->current->started = started;
}
@@ -1250,8 +1252,10 @@ qemuDomainObjPrivateXMLFormatJob(virBuffer *buf,
priv->job.phase));
}
- if (priv->job.asyncJob != VIR_ASYNC_JOB_NONE)
+ if (priv->job.asyncJob != VIR_ASYNC_JOB_NONE) {
virBufferAsprintf(&attrBuf, " flags='0x%lx'", priv->job.apiFlags);
+ virBufferAsprintf(&attrBuf, " asyncStarted='%llu'", priv->job.asyncStarted);
+ }
if (priv->job.cb &&
priv->job.cb->formatJob(&childBuf, &priv->job, vm) < 0)
@@ -1307,6 +1311,13 @@ qemuDomainObjPrivateXMLParseJob(virDomainObj *vm,
}
VIR_FREE(tmp);
}
+
+ if (virXPathULongLong("string(@asyncStarted)", ctxt,
+ &priv->job.asyncStarted) == -2) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("Invalid async job start"));
+ return -1;
+ }
}
if (virXPathULongHex("string(@flags)", ctxt, &priv->job.apiFlags) == -2) {
diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h
index 069bb9f8cb..707d4e91ed 100644
--- a/src/qemu/qemu_domainjob.h
+++ b/src/qemu/qemu_domainjob.h
@@ -164,6 +164,7 @@ void
qemuDomainObjRestoreAsyncJob(virDomainObj *vm,
virDomainAsyncJob asyncJob,
int phase,
+ unsigned long long started,
virDomainJobOperation operation,
qemuDomainJobStatsType statsType,
virDomainJobStatus status,
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 081b049672..a87dc9a1fb 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3402,7 +3402,8 @@ qemuProcessRestoreMigrationJob(virDomainObj *vm,
allowedJobs = VIR_JOB_DEFAULT_MASK | JOB_MASK(VIR_JOB_MIGRATION_OP);
}
- qemuDomainObjRestoreAsyncJob(vm, job->asyncJob, job->phase, op,
+ qemuDomainObjRestoreAsyncJob(vm, job->asyncJob, job->phase,
+ job->asyncStarted, op,
QEMU_DOMAIN_JOB_STATS_TYPE_MIGRATION,
VIR_DOMAIN_JOB_STATUS_PAUSED,
allowedJobs);
@@ -3675,6 +3676,7 @@ qemuProcessRecoverJob(virQEMUDriver *driver,
case VIR_ASYNC_JOB_BACKUP:
/* Restore the config of the async job which is not persisted */
qemuDomainObjRestoreAsyncJob(vm, VIR_ASYNC_JOB_BACKUP, 0,
+ job->asyncStarted,
VIR_DOMAIN_JOB_OPERATION_BACKUP,
QEMU_DOMAIN_JOB_STATS_TYPE_BACKUP,
VIR_DOMAIN_JOB_STATUS_ACTIVE,
diff --git a/tests/qemustatusxml2xmldata/migration-in-params-in.xml b/tests/qemustatusxml2xmldata/migration-in-params-in.xml
index 8b0878c82e..1086f5230d 100644
--- a/tests/qemustatusxml2xmldata/migration-in-params-in.xml
+++ b/tests/qemustatusxml2xmldata/migration-in-params-in.xml
@@ -238,7 +238,7 @@
<flag name='dump-completed'/>
<flag name='hda-output'/>
</qemuCaps>
- <job type='none' async='migration in' phase='prepare' flags='0x900'>
+ <job type='none' async='migration in' phase='prepare' flags='0x900' asyncStarted='0'>
<migParams>
<param name='compress-level' value='1'/>
<param name='compress-threads' value='8'/>
diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-bitmaps-in.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-bitmaps-in.xml
index 7d55db0996..4ee44ffbd4 100644
--- a/tests/qemustatusxml2xmldata/migration-out-nbd-bitmaps-in.xml
+++ b/tests/qemustatusxml2xmldata/migration-out-nbd-bitmaps-in.xml
@@ -262,7 +262,7 @@
<flag name='cpu-max'/>
<flag name='migration-param.block-bitmap-mapping'/>
</qemuCaps>
- <job type='none' async='migration out' phase='perform3' flags='0x42'>
+ <job type='none' async='migration out' phase='perform3' flags='0x42' asyncStarted='0'>
<disk dev='hda' migrating='no'/>
<disk dev='vda' migrating='yes'>
<migrationSource type='network' format='raw'>
diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml
index 1a918c0b5a..540e385de3 100644
--- a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml
+++ b/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml
@@ -231,7 +231,7 @@
<flag name='dump-completed'/>
<flag name='hda-output'/>
</qemuCaps>
- <job type='none' async='migration out' phase='perform3' flags='0x0'>
+ <job type='none' async='migration out' phase='perform3' flags='0x0' asyncStarted='0'>
<disk dev='vdb' migrating='yes'/>
<disk dev='hda' migrating='no'/>
</job>
diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml
index 87c67f8300..d0e997913f 100644
--- a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml
+++ b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml
@@ -235,7 +235,7 @@
<flag name='nbd-tls'/>
<flag name='blockdev-del'/>
</qemuCaps>
- <job type='none' async='migration out' phase='perform3' flags='0x0'>
+ <job type='none' async='migration out' phase='perform3' flags='0x0' asyncStarted='0'>
<disk dev='vdb' migrating='yes'>
<migrationSource type='network' format='raw'>
<source protocol='nbd' name='drive-virtio-disk1' tlsFromConfig='0'>
diff --git a/tests/qemustatusxml2xmldata/migration-out-params-in.xml b/tests/qemustatusxml2xmldata/migration-out-params-in.xml
index 73ac09fb92..758a6f03b7 100644
--- a/tests/qemustatusxml2xmldata/migration-out-params-in.xml
+++ b/tests/qemustatusxml2xmldata/migration-out-params-in.xml
@@ -238,7 +238,7 @@
<flag name='dump-completed'/>
<flag name='hda-output'/>
</qemuCaps>
- <job type='none' async='migration out' phase='perform3' flags='0x802'>
+ <job type='none' async='migration out' phase='perform3' flags='0x802' asyncStarted='0'>
<disk dev='vda' migrating='no'/>
<migParams>
<param name='compress-level' value='1'/>
--
2.35.1
