From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 5595E7721C for ; Thu, 21 Oct 2021 13:30:32 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 517381DD63 for ; Thu, 21 Oct 2021 13:30:32 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 id 82D211DD3D for ; Thu, 21 Oct 2021 13:30:31 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5998F46924 for ; Thu, 21 Oct 2021 13:30:31 +0200 (CEST) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Thu, 21 Oct 2021 13:30:22 +0200 Message-Id: <20211021113030.2649985-2-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211021113030.2649985-1-a.lauterer@proxmox.com> References: <20211021113030.2649985-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.188 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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] [PATCH v3 storage 1/9] storage: add new find_free_volname 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: , X-List-Received-Date: Thu, 21 Oct 2021 11:30:32 -0000 This new method exposes the functionality to request a new, not yet used, volname for a storage. The default implementation will return the result from 'find_free_diskname' prefixed with "/" if $scfg->{path} exists. Otherwise it will only return the result from 'find_free_diskname'. If the format suffix is added also depends on the existence of $scfg->{path}. $scfg->{path} will be present for directory based storage types. Should a storage need to return different volname, it needs to override the 'find_free_volname' method. Signed-off-by: Aaron Lauterer --- v2 -> v3: * dropped exists() checks v1 -> v2: * drop exposed 'find_free_diskname' in favor of 'find_free_volname' * dropped 'wants_fmt_suffix' as 'find_free_volname' now decides that itself rfc -> v1: dropped $add_fmt_suffix parameter and added the "wants_fmt_suffix" helper method in each plugin. PVE/Storage.pm | 9 +++++++++ PVE/Storage/Plugin.pm | 11 +++++++++++ 2 files changed, 20 insertions(+) diff --git a/PVE/Storage.pm b/PVE/Storage.pm index 71d6ad7..4fbeaea 100755 --- a/PVE/Storage.pm +++ b/PVE/Storage.pm @@ -203,6 +203,15 @@ sub storage_can_replicate { return $plugin->storage_can_replicate($scfg, $storeid, $format); } +sub find_free_volname { + my ($cfg, $storeid, $vmid, $fmt) = @_; + + my $scfg = storage_config($cfg, $storeid); + my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); + + return $plugin->find_free_volname($storeid, $scfg, $vmid, $fmt); +} + sub storage_ids { my ($cfg) = @_; diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm index aeb4fff..26465fd 100644 --- a/PVE/Storage/Plugin.pm +++ b/PVE/Storage/Plugin.pm @@ -732,6 +732,17 @@ sub find_free_diskname { return get_next_vm_diskname($disk_list, $storeid, $vmid, $fmt, $scfg, $add_fmt_suffix); } +sub find_free_volname { + my ($class, $storeid, $scfg, $vmid, $fmt) = @_; + + my $diskname = $class->find_free_diskname($storeid, $scfg, $vmid, $fmt, $scfg->{path}); + + if ($scfg->{path}) { + return "${vmid}/$diskname"; + } + return $diskname; +} + sub clone_image { my ($class, $scfg, $storeid, $volname, $vmid, $snap) = @_; -- 2.30.2