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 52C051FF15F for ; Mon, 16 Dec 2024 10:13:30 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6C649730F; Mon, 16 Dec 2024 10:13:16 +0100 (CET) To: pve-devel@lists.proxmox.com Date: Mon, 16 Dec 2024 10:12:15 +0100 In-Reply-To: <20241216091229.3142660-1-alexandre.derumier@groupe-cyllene.com> References: <20241216091229.3142660-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Message-ID: List-Id: Proxmox VE development discussion List-Post: From: Alexandre Derumier via pve-devel Precedence: list Cc: Alexandre Derumier X-Mailman-Version: 2.1.29 X-BeenThere: pve-devel@lists.proxmox.com List-Subscribe: , List-Unsubscribe: , List-Archive: Reply-To: Proxmox VE development discussion List-Help: Subject: [pve-devel] [PATCH v1 pve-qemu 1/1] add block-commit-replaces option patch Content-Type: multipart/mixed; boundary="===============1882732631202179302==" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" --===============1882732631202179302== Content-Type: message/rfc822 Content-Disposition: inline Return-Path: X-Original-To: pve-devel@lists.proxmox.com Delivered-To: pve-devel@lists.proxmox.com Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id BDD23C30E1 for ; Mon, 16 Dec 2024 10:13:14 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E9ED46D3A for ; Mon, 16 Dec 2024 10:12:43 +0100 (CET) Received: from bastiontest.odiso.net (unknown [IPv6:2a0a:1580:2000:6700::14]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 16 Dec 2024 10:12:38 +0100 (CET) Received: from formationkvm1.odiso.net (unknown [10.11.201.57]) by bastiontest.odiso.net (Postfix) with ESMTP id 175B08540D4; Mon, 16 Dec 2024 10:12:32 +0100 (CET) Received: by formationkvm1.odiso.net (Postfix, from userid 0) id 4B70D1084C73; Mon, 16 Dec 2024 10:12:31 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Subject: [PATCH v1 pve-qemu 1/1] add block-commit-replaces option patch Date: Mon, 16 Dec 2024 10:12:15 +0100 Message-Id: <20241216091229.3142660-2-alexandre.derumier@groupe-cyllene.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241216091229.3142660-1-alexandre.derumier@groupe-cyllene.com> References: <20241216091229.3142660-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.040 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_NONE 0.1 DMARC none policy HEADER_FROM_DIFFERENT_DOMAINS 0.248 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_NONE 0.25 DKIM has Failed or SPF has failed on the message and the domain has no DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record This is needed for external snapshot live commit, when the top blocknode is not the fmt-node. (in our case, the throttle-group node is the topnode) Signed-off-by: Alexandre Derumier --- ...052-block-commit-add-replaces-option.patch | 137 ++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 138 insertions(+) create mode 100644 debian/patches/pve/0052-block-commit-add-replaces-option.patch diff --git a/debian/patches/pve/0052-block-commit-add-replaces-option.patch b/debian/patches/pve/0052-block-commit-add-replaces-option.patch new file mode 100644 index 0000000..2488b5b --- /dev/null +++ b/debian/patches/pve/0052-block-commit-add-replaces-option.patch @@ -0,0 +1,137 @@ +From ae39fd3bb72db440cf380978af9bf5693c12ac6c Mon Sep 17 00:00:00 2001 +From: Alexandre Derumier +Date: Wed, 11 Dec 2024 16:20:25 +0100 +Subject: [PATCH] block-commit: add replaces option + +This use same code than drive-mirror for live commit, but the option +is not send currently. + +Allow to replaces a different node than the root node after the block-commit +(as we use throttle-group as root, and not the drive) +--- + block/mirror.c | 4 ++-- + block/replication.c | 2 +- + blockdev.c | 4 ++-- + include/block/block_int-global-state.h | 4 +++- + qapi/block-core.json | 5 ++++- + qemu-img.c | 2 +- + 6 files changed, 13 insertions(+), 8 deletions(-) + +diff --git a/block/mirror.c b/block/mirror.c +index 2f12238..1a5e528 100644 +--- a/block/mirror.c ++++ b/block/mirror.c +@@ -2086,7 +2086,7 @@ BlockJob *commit_active_start(const char *job_id, BlockDriverState *bs, + int64_t speed, BlockdevOnError on_error, + const char *filter_node_name, + BlockCompletionFunc *cb, void *opaque, +- bool auto_complete, Error **errp) ++ bool auto_complete, const char *replaces, Error **errp) + { + bool base_read_only; + BlockJob *job; +@@ -2102,7 +2102,7 @@ BlockJob *commit_active_start(const char *job_id, BlockDriverState *bs, + } + + job = mirror_start_job( +- job_id, bs, creation_flags, base, NULL, speed, 0, 0, ++ job_id, bs, creation_flags, base, replaces, speed, 0, 0, + MIRROR_LEAVE_BACKING_CHAIN, false, + on_error, on_error, true, cb, opaque, + &commit_active_job_driver, MIRROR_SYNC_MODE_FULL, +diff --git a/block/replication.c b/block/replication.c +index 0415a5e..debbe25 100644 +--- a/block/replication.c ++++ b/block/replication.c +@@ -711,7 +711,7 @@ static void replication_stop(ReplicationState *rs, bool failover, Error **errp) + s->commit_job = commit_active_start( + NULL, bs->file->bs, s->secondary_disk->bs, + JOB_INTERNAL, 0, BLOCKDEV_ON_ERROR_REPORT, +- NULL, replication_done, bs, true, errp); ++ NULL, replication_done, bs, true, NULL, errp); + bdrv_graph_rdunlock_main_loop(); + break; + default: +diff --git a/blockdev.c b/blockdev.c +index cbe2243..349fb71 100644 +--- a/blockdev.c ++++ b/blockdev.c +@@ -2435,7 +2435,7 @@ void qmp_block_commit(const char *job_id, const char *device, + const char *filter_node_name, + bool has_auto_finalize, bool auto_finalize, + bool has_auto_dismiss, bool auto_dismiss, +- Error **errp) ++ const char *replaces, Error **errp) + { + BlockDriverState *bs; + BlockDriverState *iter; +@@ -2596,7 +2596,7 @@ void qmp_block_commit(const char *job_id, const char *device, + job_id = bdrv_get_device_name(bs); + } + commit_active_start(job_id, top_bs, base_bs, job_flags, speed, on_error, +- filter_node_name, NULL, NULL, false, &local_err); ++ filter_node_name, NULL, NULL, false, replaces, &local_err); + } else { + BlockDriverState *overlay_bs = bdrv_find_overlay(bs, top_bs); + if (bdrv_op_is_blocked(overlay_bs, BLOCK_OP_TYPE_COMMIT_TARGET, errp)) { +diff --git a/include/block/block_int-global-state.h b/include/block/block_int-global-state.h +index f0c642b..194b580 100644 +--- a/include/block/block_int-global-state.h ++++ b/include/block/block_int-global-state.h +@@ -115,6 +115,7 @@ void commit_start(const char *job_id, BlockDriverState *bs, + * @cb: Completion function for the job. + * @opaque: Opaque pointer value passed to @cb. + * @auto_complete: Auto complete the job. ++ * @replaces: Block graph node name to replace once the commit is done. + * @errp: Error object. + * + */ +@@ -123,7 +124,8 @@ BlockJob *commit_active_start(const char *job_id, BlockDriverState *bs, + int64_t speed, BlockdevOnError on_error, + const char *filter_node_name, + BlockCompletionFunc *cb, void *opaque, +- bool auto_complete, Error **errp); ++ bool auto_complete, const char *replaces, ++ Error **errp); + /* + * mirror_start: + * @job_id: The id of the newly-created job, or %NULL to use the +diff --git a/qapi/block-core.json b/qapi/block-core.json +index ff441d4..50564c7 100644 +--- a/qapi/block-core.json ++++ b/qapi/block-core.json +@@ -2098,6 +2098,8 @@ + # disappear from the query list without user intervention. + # Defaults to true. (Since 3.1) + # ++# @replaces: graph node name to be replaced base image node. ++# + # Features: + # + # @deprecated: Members @base and @top are deprecated. Use @base-node +@@ -2125,7 +2127,8 @@ + '*speed': 'int', + '*on-error': 'BlockdevOnError', + '*filter-node-name': 'str', +- '*auto-finalize': 'bool', '*auto-dismiss': 'bool' }, ++ '*auto-finalize': 'bool', '*auto-dismiss': 'bool', ++ '*replaces': 'str' }, + 'allow-preconfig': true } + + ## +diff --git a/qemu-img.c b/qemu-img.c +index a6c88e0..f6c59bc 100644 +--- a/qemu-img.c ++++ b/qemu-img.c +@@ -1079,7 +1079,7 @@ static int img_commit(int argc, char **argv) + + commit_active_start("commit", bs, base_bs, JOB_DEFAULT, rate_limit, + BLOCKDEV_ON_ERROR_REPORT, NULL, common_block_job_cb, +- &cbi, false, &local_err); ++ &cbi, false, NULL, &local_err); + if (local_err) { + goto done; + } +-- +2.39.5 + diff --git a/debian/patches/series b/debian/patches/series index 93c97bf..e604a23 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -92,3 +92,4 @@ pve/0048-PVE-backup-fixup-error-handling-for-fleecing.patch pve/0049-PVE-backup-factor-out-setting-up-snapshot-access-for.patch pve/0050-PVE-backup-save-device-name-in-device-info-structure.patch pve/0051-PVE-backup-include-device-name-in-error-when-setting.patch +pve/0052-block-commit-add-replaces-option.patch -- 2.39.5 --===============1882732631202179302== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel --===============1882732631202179302==--