d03e1b3ce3
User-facing breaking change:
The slirp submodule for user networking got removed. It would be
necessary to add the --enable-slirp option to the build and/or install
the appropriate library to continue building it. Since PVE is not
explicitly supporting it, it would require additionally installing the
libslirp0 package on all installations and there is *very* little
mention on the community forum when searching for "slirp" or
"netdev user", the plan is to only enable it again if there is some
real demand for it.
Notable changes:
* The big change for this release is the rework of job locking, using
a job mutex and introducing _locked() variants of job API functions
moving away from call-side AioContext locking. See (in the qemu
submodule) commit 6f592e5aca ("job.c: enable job lock/unlock and
remove Aiocontext locks") and previous commits for context.
Changes required for the backup patches:
* Use WITH_JOB_LOCK_GUARD() and call the _locked() variant of job
API functions where appropriate (many are only availalbe as
a _locked() variant).
* Remove acquiring/releasing AioContext around functions taking the
job mutex lock internally.
The patch introducing sequential transaction support for jobs needs
to temporarily unlock the job mutex to call job_start() when
starting the next job in the transaction.
* The zeroinit block driver now marks its child as primary.
The documentation in include/block/block-common.h states:
> Filter node has exactly one FILTERED|PRIMARY child, and may have
> other children which must not have these bits
Without this, an assert will trigger when copying to a zeroinit target
with qemu-img convert, because bdrv_child_cb_attach() expects any
non-PRIMARY child to be not FILTERED:
> qemu-img convert -n -p -f raw -O raw input.raw zeroinit:output.raw
> qemu-img: ../block.c:1476: bdrv_child_cb_attach: Assertion
> `!(child->role & BDRV_CHILD_FILTERED)' failed.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
61 lines
2.0 KiB
Diff
61 lines
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Fabian Ebner <f.ebner@proxmox.com>
|
|
Date: Wed, 25 May 2022 13:59:37 +0200
|
|
Subject: [PATCH] PVE-Backup: create jobs: correctly cancel in error scenario
|
|
|
|
The first call to job_cancel_sync() will cancel and free all jobs in
|
|
the transaction, so ensure that it's called only once and get rid of
|
|
the job_unref() that would operate on freed memory.
|
|
|
|
It's also necessary to NULL backup_state.pbs in the error scenario,
|
|
because a subsequent backup_cancel QMP call (as happens in PVE when
|
|
the backup QMP command fails) would try to call proxmox_backup_abort()
|
|
and run into a segfault.
|
|
|
|
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|
[FE: adapt for new job lock mechanism replacing AioContext locks]
|
|
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|
---
|
|
pve-backup.c | 10 ++++++++--
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/pve-backup.c b/pve-backup.c
|
|
index 262e7d3894..fde3554133 100644
|
|
--- a/pve-backup.c
|
|
+++ b/pve-backup.c
|
|
@@ -503,6 +503,11 @@ static void create_backup_jobs_bh(void *opaque) {
|
|
}
|
|
|
|
if (*errp) {
|
|
+ /*
|
|
+ * It's enough to cancel one job in the transaction, the rest will
|
|
+ * follow automatically.
|
|
+ */
|
|
+ bool canceled = false;
|
|
l = backup_state.di_list;
|
|
while (l) {
|
|
PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
|
|
@@ -513,11 +518,11 @@ static void create_backup_jobs_bh(void *opaque) {
|
|
di->target = NULL;
|
|
}
|
|
|
|
- if (di->job) {
|
|
+ if (!canceled && di->job) {
|
|
WITH_JOB_LOCK_GUARD() {
|
|
job_cancel_sync_locked(&di->job->job, true);
|
|
- job_unref_locked(&di->job->job);
|
|
}
|
|
+ canceled = true;
|
|
}
|
|
}
|
|
}
|
|
@@ -943,6 +948,7 @@ err:
|
|
|
|
if (pbs) {
|
|
proxmox_backup_disconnect(pbs);
|
|
+ backup_state.pbs = NULL;
|
|
}
|
|
|
|
if (backup_dir) {
|