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 C6DB21FF164 for ; Fri, 4 Jul 2025 08:45:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 547283019C; Fri, 4 Jul 2025 08:45:22 +0200 (CEST) To: pve-devel@lists.proxmox.com Date: Fri, 4 Jul 2025 08:45:01 +0200 In-Reply-To: <20250704064507.511884-1-alexandre.derumier@groupe-cyllene.com> References: <20250704064507.511884-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 pve-storage 04/10] rename_volume: add source && target snap Content-Type: multipart/mixed; boundary="===============8865335888618939880==" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" --===============8865335888618939880== 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 CE1E8D53FA for ; Fri, 4 Jul 2025 08:45:20 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8387E1FE5B for ; Fri, 4 Jul 2025 08:45:19 +0200 (CEST) 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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 4 Jul 2025 08:45:16 +0200 (CEST) Received: from formationkvm1.odiso.net (unknown [10.11.201.57]) by bastiontest.odiso.net (Postfix) with ESMTP id 064AA862E4C; Fri, 4 Jul 2025 08:45:09 +0200 (CEST) Received: by formationkvm1.odiso.net (Postfix, from userid 0) id 03C4F10D77E4; Fri, 4 Jul 2025 08:45:09 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Subject: [PATCH pve-storage 04/10] rename_volume: add source && target snap Date: Fri, 4 Jul 2025 08:45:01 +0200 Message-Id: <20250704064507.511884-8-alexandre.derumier@groupe-cyllene.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250704064507.511884-1-alexandre.derumier@groupe-cyllene.com> References: <20250704064507.511884-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.107 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.001 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 allow to rename from|to external snapshot volname Signed-off-by: Alexandre Derumier --- src/PVE/Storage.pm | 10 ++++++++-- src/PVE/Storage/LVMPlugin.pm | 17 +++++++++++++++-- src/PVE/Storage/Plugin.pm | 14 +++++++++++++- 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/src/PVE/Storage.pm b/src/PVE/Storage.pm index 7861bf6..fe6eaf7 100755 --- a/src/PVE/Storage.pm +++ b/src/PVE/Storage.pm @@ -2319,7 +2319,7 @@ sub complete_volume { } sub rename_volume { - my ($cfg, $source_volid, $target_vmid, $target_volname) = @_; + my ($cfg, $source_volid, $target_vmid, $target_volname, $source_snap, $target_snap) = @_; die "no source volid provided\n" if !$source_volid; die "no target VMID or target volname provided\n" if !$target_vmid && !$target_volname; @@ -2339,7 +2339,13 @@ sub rename_volume { undef, sub { return $plugin->rename_volume( - $scfg, $storeid, $source_volname, $target_vmid, $target_volname, + $scfg, + $storeid, + $source_volname, + $target_vmid, + $target_volname, + $source_snap, + $target_snap, ); }, ); diff --git a/src/PVE/Storage/LVMPlugin.pm b/src/PVE/Storage/LVMPlugin.pm index 1a992e8..0b506c7 100644 --- a/src/PVE/Storage/LVMPlugin.pm +++ b/src/PVE/Storage/LVMPlugin.pm @@ -838,11 +838,24 @@ sub volume_import_write { } sub rename_volume { - my ($class, $scfg, $storeid, $source_volname, $target_vmid, $target_volname) = @_; + my ( + $class, + $scfg, + $storeid, + $source_volname, + $target_vmid, + $target_volname, + $source_snap, + $target_snap, + ) = @_; my ( undef, $source_image, $source_vmid, $base_name, $base_vmid, undef, $format, ) = $class->parse_volname($source_volname); + + $source_image = $class->get_snap_volname($source_volname, $source_snap) if $source_snap; + $target_volname = $class->get_snap_volname($source_volname, $target_snap) if $target_snap; + $target_volname = $class->find_free_diskname($storeid, $scfg, $target_vmid, $format) if !$target_volname; @@ -851,7 +864,7 @@ sub rename_volume { die "target volume '${target_volname}' already exists\n" if ($lvs->{$vg}->{$target_volname}); - lvrename($vg, $source_volname, $target_volname); + lvrename($vg, $source_image, $target_volname); return "${storeid}:${target_volname}"; } diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm index c35d5e5..5afe29b 100644 --- a/src/PVE/Storage/Plugin.pm +++ b/src/PVE/Storage/Plugin.pm @@ -1877,7 +1877,16 @@ sub volume_import_formats { } sub rename_volume { - my ($class, $scfg, $storeid, $source_volname, $target_vmid, $target_volname) = @_; + my ( + $class, + $scfg, + $storeid, + $source_volname, + $target_vmid, + $target_volname, + $source_snap, + $target_snap, + ) = @_; die "not implemented in storage plugin '$class'\n" if $class->can('api') && $class->api() < 10; die "no path found\n" if !$scfg->{path}; @@ -1885,6 +1894,9 @@ sub rename_volume { undef, $source_image, $source_vmid, $base_name, $base_vmid, undef, $format, ) = $class->parse_volname($source_volname); + $source_image = $class->get_snap_name($source_volname, $source_snap) if $source_snap; + $target_volname = $class->get_snap_name($source_volname, $target_snap) if $target_snap; + $target_volname = $class->find_free_diskname($storeid, $scfg, $target_vmid, $format, 1) if !$target_volname; -- 2.39.5 --===============8865335888618939880== 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 --===============8865335888618939880==--