From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id 3556A1FF2B0
for <inbox@lore.proxmox.com>; Fri, 5 Jul 2024 15:14:21 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id AA1A93354;
Fri, 5 Jul 2024 15:14:38 +0200 (CEST)
From: Maximiliano Sandoval <m.sandoval@proxmox.com>
To: Aaron Lauterer <a.lauterer@proxmox.com>
In-Reply-To: <16f29fdd-8a9c-4c7f-8fdd-8664d0a2c041@proxmox.com> (Aaron
Lauterer's message of "Thu, 4 Jul 2024 16:47:30 +0200")
References: <20240704120213.351520-1-m.sandoval@proxmox.com>
<16f29fdd-8a9c-4c7f-8fdd-8664d0a2c041@proxmox.com>
Date: Fri, 05 Jul 2024 15:14:04 +0200
Message-ID: <s8o5xtkkmlf.fsf@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.122 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
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
URI_NOVOWEL 0.5 URI hostname has long non-vowel sequence
Subject: Re: [pve-devel] [PATCH storage v3] fix #4272: btrfs: add rename
feature
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Cc: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
Aaron Lauterer <a.lauterer@proxmox.com> writes:
> gave it a try and it does what it should.
> by enabling the rename feature only for `raw` we avoid potential pitfalls if we
> encounter a non regular situation on BTRFS. For example, an
> images/{vmid}/vm-{vmid}-disk-X.qcow2 file directly instead of the
> images/{vmid}/vm-{vmid}-disk-X/disk.raw as is the way the BTRFS plugin handles
> it in subvolumes.
>
> But if we add the following diff, it seems to handle the case of a qcow2 file in
> the same directory structure just fine:
>
> diff --git a/src/PVE/Storage/BTRFSPlugin.pm b/src/PVE/Storage/BTRFSPlugin.pm
> index 7376ae4..143442c 100644
> --- a/src/PVE/Storage/BTRFSPlugin.pm
> +++ b/src/PVE/Storage/BTRFSPlugin.pm
> @@ -619,7 +619,7 @@ sub volume_has_feature {
> current => { qcow2 => 1, raw => 1, vmdk => 1 },
> },
> rename => {
> - current => { raw => 1 },
> + current => { qcow2 => 1, raw => 1},
> },
> };
>
> @@ -939,6 +939,10 @@ sub rename_volume {
>
> my $format = ($class->parse_volname($source_volname))[6];
>
> + if ($format ne 'raw' && $format ne 'subvol') {
> + return $class->SUPER::rename_volume($scfg, $storeid, $source_volname,
> $target_vmid, $target_volname);
> + }
> +
> my $ppath = $class->filesystem_path($scfg, $source_volname);
>
> $target_volname = $class->find_free_diskname($storeid, $scfg, $target_vmid,
> $format, 1)
>
>
> Since we do have that in the other functions (alloc_image, free_image), we might
> want to add it here as well, just to be safe.
>
> If we aren't concerned about this, then consider this:
>
> Reviewed-By: Aaron Lauterer <a.lauterer@proxmox.com>
> Tested-By: Aaron Lauterer <a.lauterer@proxmox.com>
I added your suggestion on v4.
--
Maximiliano
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel