From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 4B3DF1FF161 for ; Tue, 13 Aug 2024 15:28:37 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3CC301DB0; Tue, 13 Aug 2024 15:28:37 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Tue, 13 Aug 2024 15:28:07 +0200 Message-Id: <20240813132829.117460-4-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240813132829.117460-1-f.ebner@proxmox.com> References: <20240813132829.117460-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.056 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [bitmap.name] Subject: [pve-devel] [PATCH qemu v2 03/25] PVE backup: factor out setting up snapshot access for fleecing X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Avoids some line bloat in the create_backup_jobs_bh() function and is in preparation for setting up the snapshot access independently of fleecing, in particular that will be useful for providing access to the snapshot via NBD. Signed-off-by: Fiona Ebner --- No changes in v2. pve-backup.c | 95 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 58 insertions(+), 37 deletions(-) diff --git a/pve-backup.c b/pve-backup.c index c4178758b3..051ebffe48 100644 --- a/pve-backup.c +++ b/pve-backup.c @@ -525,6 +525,62 @@ static int coroutine_fn pvebackup_co_add_config( goto out; } +/* + * Setup a snapshot-access block node for a device with associated fleecing image. + */ +static int setup_snapshot_access(PVEBackupDevInfo *di, Error **errp) +{ + Error *local_err = NULL; + + if (!di->fleecing.bs) { + error_setg(errp, "no associated fleecing image"); + return -1; + } + + QDict *cbw_opts = qdict_new(); + qdict_put_str(cbw_opts, "driver", "copy-before-write"); + qdict_put_str(cbw_opts, "file", bdrv_get_node_name(di->bs)); + qdict_put_str(cbw_opts, "target", bdrv_get_node_name(di->fleecing.bs)); + + if (di->bitmap) { + /* + * Only guest writes to parts relevant for the backup need to be intercepted with + * old data being copied to the fleecing image. + */ + qdict_put_str(cbw_opts, "bitmap.node", bdrv_get_node_name(di->bs)); + qdict_put_str(cbw_opts, "bitmap.name", bdrv_dirty_bitmap_name(di->bitmap)); + } + /* + * Fleecing storage is supposed to be fast and it's better to break backup than guest + * writes. Certain guest drivers like VirtIO-win have 60 seconds timeout by default, so + * abort a bit before that. + */ + qdict_put_str(cbw_opts, "on-cbw-error", "break-snapshot"); + qdict_put_int(cbw_opts, "cbw-timeout", 45); + + di->fleecing.cbw = bdrv_insert_node(di->bs, cbw_opts, BDRV_O_RDWR, &local_err); + + if (!di->fleecing.cbw) { + error_setg(errp, "appending cbw node for fleecing failed: %s", + local_err ? error_get_pretty(local_err) : "unknown error"); + return -1; + } + + QDict *snapshot_access_opts = qdict_new(); + qdict_put_str(snapshot_access_opts, "driver", "snapshot-access"); + qdict_put_str(snapshot_access_opts, "file", bdrv_get_node_name(di->fleecing.cbw)); + + di->fleecing.snapshot_access = + bdrv_open(NULL, NULL, snapshot_access_opts, BDRV_O_RDWR | BDRV_O_UNMAP, &local_err); + if (!di->fleecing.snapshot_access) { + error_setg(errp, "setting up snapshot access for fleecing failed: %s", + local_err ? error_get_pretty(local_err) : "unknown error"); + return -1; + } + + return 0; +} + /* * backup_job_create can *not* be run from a coroutine, so this can't either. * The caller is responsible that backup_mutex is held nonetheless. @@ -569,49 +625,14 @@ static void create_backup_jobs_bh(void *opaque) { const char *job_id = bdrv_get_device_name(di->bs); bdrv_graph_co_rdunlock(); if (di->fleecing.bs) { - QDict *cbw_opts = qdict_new(); - qdict_put_str(cbw_opts, "driver", "copy-before-write"); - qdict_put_str(cbw_opts, "file", bdrv_get_node_name(di->bs)); - qdict_put_str(cbw_opts, "target", bdrv_get_node_name(di->fleecing.bs)); - - if (di->bitmap) { - /* - * Only guest writes to parts relevant for the backup need to be intercepted with - * old data being copied to the fleecing image. - */ - qdict_put_str(cbw_opts, "bitmap.node", bdrv_get_node_name(di->bs)); - qdict_put_str(cbw_opts, "bitmap.name", bdrv_dirty_bitmap_name(di->bitmap)); - } - /* - * Fleecing storage is supposed to be fast and it's better to break backup than guest - * writes. Certain guest drivers like VirtIO-win have 60 seconds timeout by default, so - * abort a bit before that. - */ - qdict_put_str(cbw_opts, "on-cbw-error", "break-snapshot"); - qdict_put_int(cbw_opts, "cbw-timeout", 45); - - di->fleecing.cbw = bdrv_insert_node(di->bs, cbw_opts, BDRV_O_RDWR, &local_err); - - if (!di->fleecing.cbw) { - error_setg(errp, "appending cbw node for fleecing failed: %s", - local_err ? error_get_pretty(local_err) : "unknown error"); - bdrv_drained_end(di->bs); - break; - } - - QDict *snapshot_access_opts = qdict_new(); - qdict_put_str(snapshot_access_opts, "driver", "snapshot-access"); - qdict_put_str(snapshot_access_opts, "file", bdrv_get_node_name(di->fleecing.cbw)); - - di->fleecing.snapshot_access = - bdrv_open(NULL, NULL, snapshot_access_opts, BDRV_O_RDWR | BDRV_O_UNMAP, &local_err); - if (!di->fleecing.snapshot_access) { + if (setup_snapshot_access(di, &local_err) < 0) { error_setg(errp, "setting up snapshot access for fleecing failed: %s", local_err ? error_get_pretty(local_err) : "unknown error"); cleanup_snapshot_access(di); bdrv_drained_end(di->bs); break; } + source_bs = di->fleecing.snapshot_access; discard_source = true; -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel