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 0B89E708A6 for ; Thu, 24 Jun 2021 16:59:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id ED391EE22 for ; Thu, 24 Jun 2021 16:58:37 +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 7B814EE19 for ; Thu, 24 Jun 2021 16:58:37 +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 4A02D46796 for ; Thu, 24 Jun 2021 16:58:37 +0200 (CEST) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Thu, 24 Jun 2021 16:58:33 +0200 Message-Id: <20210624145833.28372-1-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.725 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 qemu-server] don't default to O_DIRECT on btrfs without nocow 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, 24 Jun 2021 14:59:08 -0000 otherwise it'll produce a whole lot of checksum errors and while this would be nice as a storage feature check, it's hard to be 100% accurate there anyway since a directory storage can point anywhere, like for instance a btrfs directory, causing the same issue... Signed-off-by: Wolfgang Bumiller --- PVE/QemuServer.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 25282b7..8af4176 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -1530,14 +1530,15 @@ sub print_drive_commandline_full { my $format = $drive->{format}; my $drive_id = get_drive_id($drive); + my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1); + my $scfg = $storeid ? PVE::Storage::storage_config($storecfg, $storeid) : undef; + if (drive_is_cdrom($drive)) { $path = get_iso_path($storecfg, $vmid, $volid); die "$drive_id: cannot back cdrom drive with PBS snapshot\n" if $pbs_name; } else { - my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1); if ($storeid) { $path = PVE::Storage::path($storecfg, $volid); - my $scfg = PVE::Storage::storage_config($storecfg, $storeid); $format //= qemu_img_format($scfg, $volname); } else { $path = $volid; @@ -1594,7 +1595,7 @@ sub print_drive_commandline_full { if (my $cache = $drive->{cache}) { $cache_direct = $cache =~ /^(?:off|none|directsync)$/; - } elsif (!drive_is_cdrom($drive)) { + } elsif (!drive_is_cdrom($drive) && !($scfg && $scfg->{type} eq 'btrfs' && !$scfg->{nocow})) { $opts .= ",cache=none"; $cache_direct = 1; } -- 2.30.2