From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 3C0121FF183 for ; Wed, 19 Nov 2025 18:23:07 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E0C0214FBE; Wed, 19 Nov 2025 18:23:10 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Wed, 19 Nov 2025 18:22:57 +0100 Message-ID: <20251119172304.417132-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1763572956393 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.017 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 Subject: [pve-devel] [RFC storage] lvm plugin: fix locking for rollback when using CLI 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" For some reason still to be determined, doing a rollback via CLI on an LVM storage with snapshot-as-volume-chain and saferemove would run into locking issues (likely trying to re-acquire the lock it already holds a second time). The same issue does not happen when the rollback is done via UI. Avoid doing fork_cleanup_worker() inside the locked section to avoid this. Fixes: 8eabcc7 ("lvm plugin: snapshot-as-volume-chain: use locking for snapshot operations") Signed-off-by: Fiona Ebner --- src/PVE/Storage/LVMPlugin.pm | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/PVE/Storage/LVMPlugin.pm b/src/PVE/Storage/LVMPlugin.pm index 97f7bf4..164437a 100644 --- a/src/PVE/Storage/LVMPlugin.pm +++ b/src/PVE/Storage/LVMPlugin.pm @@ -1117,23 +1117,17 @@ sub volume_rollback_is_possible { } my sub volume_snapshot_rollback_locked { - my ($class, $scfg, $storeid, $volname, $snap) = @_; + my ($class, $scfg, $storeid, $volname, $snap, $cleanup_worker) = @_; my $format = ($class->parse_volname($volname))[6]; die "can't rollback snapshot for '$format' volume\n" if $format ne 'qcow2'; - my $cleanup_worker = eval { free_snap_image($class, $storeid, $scfg, $volname, 'current'); }; + $cleanup_worker->$* = eval { free_snap_image($class, $storeid, $scfg, $volname, 'current'); }; die "error deleting snapshot $snap $@\n" if $@; eval { alloc_snap_image($class, $storeid, $scfg, $volname, $snap) }; - my $alloc_err = $@; - - fork_cleanup_worker($cleanup_worker); - - if ($alloc_err) { - die "can't allocate new volume $volname: $alloc_err\n"; - } + die "can't allocate new volume $volname: $@\n" if $@; return undef; } @@ -1141,14 +1135,22 @@ my sub volume_snapshot_rollback_locked { sub volume_snapshot_rollback { my ($class, $scfg, $storeid, $volname, $snap) = @_; - return $class->cluster_lock_storage( + my $cleanup_worker; + + $class->cluster_lock_storage( $storeid, $scfg->{shared}, undef, sub { - return volume_snapshot_rollback_locked($class, $scfg, $storeid, $volname, $snap); + volume_snapshot_rollback_locked( + $class, $scfg, $storeid, $volname, $snap, \$cleanup_worker, + ); }, ); + + fork_cleanup_worker($cleanup_worker); + + return; } sub volume_snapshot_delete { -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel