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 2C4DC1FF15C for ; Fri, 8 Aug 2025 15:15:47 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 60DD318592; Fri, 8 Aug 2025 15:17:19 +0200 (CEST) Date: Fri, 8 Aug 2025 15:16:45 +0200 From: Wolfgang Bumiller To: Fabian =?utf-8?Q?Gr=C3=BCnbichler?= Message-ID: References: <20250729111557.136012-1-w.bumiller@proxmox.com> <20250729111557.136012-13-w.bumiller@proxmox.com> <1753861872.ebrufjlsgm.astroid@yuna.none> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1753861872.ebrufjlsgm.astroid@yuna.none> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1754658981043 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.076 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [plugin.pm] Subject: Re: [pve-devel] [PATCH storage 12/26] plugin: support new vtypes in activate_storage checks 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 Cc: Proxmox VE development discussion Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" On Wed, Jul 30, 2025 at 10:36:59AM +0200, Fabian Gr=FCnbichler wrote: > On July 29, 2025 1:15 pm, Wolfgang Bumiller wrote: > > Signed-off-by: Wolfgang Bumiller > > --- > > src/PVE/Storage/Plugin.pm | 20 ++++++++++++++++++-- > > 1 file changed, 18 insertions(+), 2 deletions(-) > > = > > diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm > > index 98788d1..047b2fc 100644 > > --- a/src/PVE/Storage/Plugin.pm > > +++ b/src/PVE/Storage/Plugin.pm > > @@ -1882,15 +1882,31 @@ sub activate_storage { > > = > > # check that content dirs are pairwise inequal > > my $resolved_subdirs =3D {}; > > - for my $vtype (sort keys $scfg->{content}->%*) { > > + my %done; > > + my $check =3D sub { > > + my ($vtype) =3D @_; > > + > > + return if $done{$vtype}; > > + $done{$vtype} =3D 1; > > + > > my $subdir =3D $class->get_subdir($scfg, $vtype); > > my $abs_subdir =3D abs_path($subdir); > > - next if !defined($abs_subdir); > > + return if !defined($abs_subdir); > > = > > die "storage '$storeid' uses directory $abs_subdir for mul= tiple content types\n" > > if defined($abs_subdir) && defined($resolved_subdirs->= {$abs_subdir}); > > = > > $resolved_subdirs->{$abs_subdir} =3D 1; > > + }; > > + for my $vtype (sort keys $scfg->{content}->%*) { > > + if ($vtype eq 'images') { > = > shouldn't we also check for 'images' as well? we don't want that to > overlap with vm-vol or ct-vol! Yes. > = > > + $check->('vm-vol'); > > + $check->('ct-vol'); > > + } elsif ($vtype eq 'rootdir') { > = > same here, since this was actually mapped to the dir for 'images' in > practice? The reason this change even exists was because 'images' and 'rootdir' by *default* are the same. But also, rootdir had no effect, so after some thought, maybe we should just warn users when they try to modify the 'rootdir' directory? As in: for my $vtype (sort keys $scfg->{content}->%*) { if ($vtype eq 'rootdir') { warn "content-dir for 'rootdir' has no effect, set dirs for= 'ct-vol' instead\n"; next; } $check->($vtype); if ($vtype eq 'images') { $check->('vm-vol'); $check->('ct-vol'); } } > = > > + $check->('ct-vol'); > > + } else { > > + $check->($vtype); > > + } > > } > > } > > } > > -- = > > 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel